updating generaltests with eip158

203 files changed, 4854 insertions, 138 deletions

diff --git a/GeneralStateTests/stBoundsTest/BLOCKHASH_Bounds.json b/GeneralStateTests/stBoundsTest/BLOCKHASH_Bounds.json
new file mode 100644
index 000000000..4a2601e3e
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/BLOCKHASH_Bounds.json
@@ -0,0 +1,85 @@
+{
+    "BLOCKHASH_Bounds" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "82ab2906bd563e7d8f4ce84e222ad3e3cfb396bbba42a587677ec7f03610ac38",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "82ab2906bd563e7d8f4ce84e222ad3e3cfb396bbba42a587677ec7f03610ac38",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "82ab2906bd563e7d8f4ce84e222ad3e3cfb396bbba42a587677ec7f03610ac38",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "82ab2906bd563e7d8f4ce84e222ad3e3cfb396bbba42a587677ec7f03610ac38",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60004060005563ffffffff4060015567ffffffffffffffff406002556fffffffffffffffffffffffffffffffff406003557fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40600455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x7fffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "0x7ffffffffffffff0"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/BLOCKHASH_BoundsOOG.json b/GeneralStateTests/stBoundsTest/BLOCKHASH_BoundsOOG.json
new file mode 100644
index 000000000..6cbb70586
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/BLOCKHASH_BoundsOOG.json
@@ -0,0 +1,85 @@
+{
+    "BLOCKHASH_BoundsOOG" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "82ab2906bd563e7d8f4ce84e222ad3e3cfb396bbba42a587677ec7f03610ac38",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "82ab2906bd563e7d8f4ce84e222ad3e3cfb396bbba42a587677ec7f03610ac38",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "82ab2906bd563e7d8f4ce84e222ad3e3cfb396bbba42a587677ec7f03610ac38",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "82ab2906bd563e7d8f4ce84e222ad3e3cfb396bbba42a587677ec7f03610ac38",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60004060005563ffffffff4060015567ffffffffffffffff406002556fffffffffffffffffffffffffffffffff406003557fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff40600455",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x7fffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "150000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/CALLCODE_Bounds2OOG.json b/GeneralStateTests/stBoundsTest/CALLCODE_Bounds2OOG.json
new file mode 100644
index 000000000..3bf5d67ec
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/CALLCODE_Bounds2OOG.json
@@ -0,0 +1,92 @@
+{
+    "CALLCODE_Bounds2OOG" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "78b8826f9e0bd3b7245581861b05c0ae453bedd7e33ff37f92ca6588b559ded6",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "78b8826f9e0bd3b7245581861b05c0ae453bedd7e33ff37f92ca6588b559ded6",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "78b8826f9e0bd3b7245581861b05c0ae453bedd7e33ff37f92ca6588b559ded6",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "78b8826f9e0bd3b7245581861b05c0ae453bedd7e33ff37f92ca6588b559ded6",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x630fffffff630fffffff630fffffff630fffffff60007310000000000000000000000000000000000000016707fffffffffffffff2",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x600054600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "150000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/CALLCODE_Bounds3OOG.json b/GeneralStateTests/stBoundsTest/CALLCODE_Bounds3OOG.json
new file mode 100644
index 000000000..82d5237d9
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/CALLCODE_Bounds3OOG.json
@@ -0,0 +1,92 @@
+{
+    "CALLCODE_Bounds3OOG" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "a60eaa88033a93724c594b9af586d0b59e14329834385e4aa7a6d476dab17cdf",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "a60eaa88033a93724c594b9af586d0b59e14329834385e4aa7a6d476dab17cdf",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "a60eaa88033a93724c594b9af586d0b59e14329834385e4aa7a6d476dab17cdf",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "a60eaa88033a93724c594b9af586d0b59e14329834385e4aa7a6d476dab17cdf",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x63ffffffff63ffffffff63ffffffff63ffffffff60007310000000000000000000000000000000000000016707fffffffffffffff2",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x600054600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "150000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/CALLCODE_Bounds4.json b/GeneralStateTests/stBoundsTest/CALLCODE_Bounds4.json
new file mode 100644
index 000000000..681740d42
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/CALLCODE_Bounds4.json
@@ -0,0 +1,92 @@
+{
+    "CALLCODE_Bounds4" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "bb6a84b7ec1c0bb184f21090a7890e0ee8f4f3f15e06cd6cd0e380beff9cf445",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "bb6a84b7ec1c0bb184f21090a7890e0ee8f4f3f15e06cd6cd0e380beff9cf445",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "bb6a84b7ec1c0bb184f21090a7890e0ee8f4f3f15e06cd6cd0e380beff9cf445",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "bb6a84b7ec1c0bb184f21090a7890e0ee8f4f3f15e06cd6cd0e380beff9cf445",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x67ffffffffffffffff600067ffffffffffffffff600060007310000000000000000000000000000000000000016707fffffffffffffff2506fffffffffffffffffffffffffffffffff60006fffffffffffffffffffffffffffffffff600060007310000000000000000000000000000000000000016707fffffffffffffff2507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600060007310000000000000000000000000000000000000016707fffffffffffffff25067ffffffffffffffff67ffffffffffffffff67ffffffffffffffff67ffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff25067ffffffffffffffff67ffffffffffffffff67ffffffffffffffff67ffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff2507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007310000000",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x600054600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "0x7fffffffffffffff"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/CALLCODE_Bounds4OOG.json b/GeneralStateTests/stBoundsTest/CALLCODE_Bounds4OOG.json
new file mode 100644
index 000000000..36b214deb
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/CALLCODE_Bounds4OOG.json
@@ -0,0 +1,92 @@
+{
+    "CALLCODE_Bounds4OOG" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "d4a3c9e1bc0f1223c4c2a02675b60ca191c2e4936fd3b59ec03dd05eef6e8413",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "d4a3c9e1bc0f1223c4c2a02675b60ca191c2e4936fd3b59ec03dd05eef6e8413",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "d4a3c9e1bc0f1223c4c2a02675b60ca191c2e4936fd3b59ec03dd05eef6e8413",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "d4a3c9e1bc0f1223c4c2a02675b60ca191c2e4936fd3b59ec03dd05eef6e8413",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x67ffffffffffffffff600067ffffffffffffffff600060007310000000000000000000000000000000000000016707fffffffffffffff2506fffffffffffffffffffffffffffffffff60006fffffffffffffffffffffffffffffffff600060007310000000000000000000000000000000000000016707fffffffffffffff2507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600060007310000000000000000000000000000000000000016707fffffffffffffff25067ffffffffffffffff67ffffffffffffffff67ffffffffffffffff67ffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff25067ffffffffffffffff67ffffffffffffffff67ffffffffffffffff67ffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff2507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007310000000",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x600054600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "150000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/CALLCODE_BoundsOOG.json b/GeneralStateTests/stBoundsTest/CALLCODE_BoundsOOG.json
new file mode 100644
index 000000000..804867b9a
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/CALLCODE_BoundsOOG.json
@@ -0,0 +1,92 @@
+{
+    "CALLCODE_BoundsOOG" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "2c4b9214d28816b7a4aea016871aa4c9fe3a19e08b7e581990c57550162f60f3",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "2c4b9214d28816b7a4aea016871aa4c9fe3a19e08b7e581990c57550162f60f3",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "2c4b9214d28816b7a4aea016871aa4c9fe3a19e08b7e581990c57550162f60f3",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "2c4b9214d28816b7a4aea016871aa4c9fe3a19e08b7e581990c57550162f60f3",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600060007310000000000000000000000000000000000000016707fffffffffffffff250630fffffff6000630fffffff600060007310000000000000000000000000000000000000016707fffffffffffffff25063ffffffff600063ffffffff600060007310000000000000000000000000000000000000016707fffffffffffffff2506000630fffffff6000630fffffff60007310000000000000000000000000000000000000016707fffffffffffffff250600063ffffffff600063ffffffff60007310000000000000000000000000000000000000016707fffffffffffffff250600067ffffffffffffffff600067ffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff25060006fffffffffffffffffffffffffffffffff60006fffffffffffffffffffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff25060007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff2",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x600054600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "150000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/CALL_Bounds2OOG.json b/GeneralStateTests/stBoundsTest/CALL_Bounds2OOG.json
new file mode 100644
index 000000000..03863778f
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/CALL_Bounds2OOG.json
@@ -0,0 +1,92 @@
+{
+    "CALL_Bounds2OOG" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "79e32c7edc24a77ffaaa3a7eaf5cf7625c5a6fc2cc98fa4fce7996577aa819b1",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "79e32c7edc24a77ffaaa3a7eaf5cf7625c5a6fc2cc98fa4fce7996577aa819b1",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "79e32c7edc24a77ffaaa3a7eaf5cf7625c5a6fc2cc98fa4fce7996577aa819b1",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "79e32c7edc24a77ffaaa3a7eaf5cf7625c5a6fc2cc98fa4fce7996577aa819b1",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x630fffffff630fffffff630fffffff630fffffff60007310000000000000000000000000000000000000016707fffffffffffffff1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x600054600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "150000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/CALL_Bounds2aOOG.json b/GeneralStateTests/stBoundsTest/CALL_Bounds2aOOG.json
new file mode 100644
index 000000000..678f06c80
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/CALL_Bounds2aOOG.json
@@ -0,0 +1,92 @@
+{
+    "CALL_Bounds2aOOG" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "7dd4b9a040a8918b3613d2f4e304e32700cfa575657b75363bd91e773fed1c8d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "7dd4b9a040a8918b3613d2f4e304e32700cfa575657b75363bd91e773fed1c8d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "7dd4b9a040a8918b3613d2f4e304e32700cfa575657b75363bd91e773fed1c8d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "7dd4b9a040a8918b3613d2f4e304e32700cfa575657b75363bd91e773fed1c8d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x63ffffffff63ffffffff63ffffffff63ffffffff60007310000000000000000000000000000000000000016707fffffffffffffff1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x600054600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "150000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/CALL_Bounds3.json b/GeneralStateTests/stBoundsTest/CALL_Bounds3.json
new file mode 100644
index 000000000..568a29662
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/CALL_Bounds3.json
@@ -0,0 +1,92 @@
+{
+    "CALL_Bounds3" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "ffa6b268e30bda6a7aa26f0f6ca96c2263df16857b7a9e99e319dd4af10866d3",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "ffa6b268e30bda6a7aa26f0f6ca96c2263df16857b7a9e99e319dd4af10866d3",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "ffa6b268e30bda6a7aa26f0f6ca96c2263df16857b7a9e99e319dd4af10866d3",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "ffa6b268e30bda6a7aa26f0f6ca96c2263df16857b7a9e99e319dd4af10866d3",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x67ffffffffffffffff600067ffffffffffffffff600060007310000000000000000000000000000000000000016707fffffffffffffff1506fffffffffffffffffffffffffffffffff60006fffffffffffffffffffffffffffffffff600060007310000000000000000000000000000000000000016707fffffffffffffff1507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600060007310000000000000000000000000000000000000016707fffffffffffffff15063ffffffff63ffffffff63ffffffff63ffffffff60007310000000000000000000000000000000000000016707fffffffffffffff15067ffffffffffffffff67ffffffffffffffff67ffffffffffffffff67ffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff1506fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff1507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x600054600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "0x7fffffffffffffff"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/CALL_Bounds3OOG.json b/GeneralStateTests/stBoundsTest/CALL_Bounds3OOG.json
new file mode 100644
index 000000000..03542fcd6
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/CALL_Bounds3OOG.json
@@ -0,0 +1,92 @@
+{
+    "CALL_Bounds3OOG" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "8c74911ffa76564c530eebd8ad1b6c8d50c77521a79e43782391690a74c7c108",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "8c74911ffa76564c530eebd8ad1b6c8d50c77521a79e43782391690a74c7c108",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "8c74911ffa76564c530eebd8ad1b6c8d50c77521a79e43782391690a74c7c108",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "8c74911ffa76564c530eebd8ad1b6c8d50c77521a79e43782391690a74c7c108",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x67ffffffffffffffff600067ffffffffffffffff600060007310000000000000000000000000000000000000016707fffffffffffffff1506fffffffffffffffffffffffffffffffff60006fffffffffffffffffffffffffffffffff600060007310000000000000000000000000000000000000016707fffffffffffffff1507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff600060007310000000000000000000000000000000000000016707fffffffffffffff15063ffffffff63ffffffff63ffffffff63ffffffff60007310000000000000000000000000000000000000016707fffffffffffffff15067ffffffffffffffff67ffffffffffffffff67ffffffffffffffff67ffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff1506fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff1507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x600054600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "150000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/CALL_BoundsOOG.json b/GeneralStateTests/stBoundsTest/CALL_BoundsOOG.json
new file mode 100644
index 000000000..5373b1e0e
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/CALL_BoundsOOG.json
@@ -0,0 +1,92 @@
+{
+    "CALL_BoundsOOG" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "135550e1c3fc5f489840f0b4ad2311afa13c055693cb6abccf0b64eb63aca4e0",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "135550e1c3fc5f489840f0b4ad2311afa13c055693cb6abccf0b64eb63aca4e0",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "135550e1c3fc5f489840f0b4ad2311afa13c055693cb6abccf0b64eb63aca4e0",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "135550e1c3fc5f489840f0b4ad2311afa13c055693cb6abccf0b64eb63aca4e0",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600060007310000000000000000000000000000000000000016707fffffffffffffff150630fffffff6000630fffffff600060007310000000000000000000000000000000000000016707fffffffffffffff15063ffffffff600063ffffffff600060007310000000000000000000000000000000000000016707fffffffffffffff1506000630fffffff6000630fffffff60007310000000000000000000000000000000000000016707fffffffffffffff150600063ffffffff600063ffffffff60007310000000000000000000000000000000000000016707fffffffffffffff150600067ffffffffffffffff600067ffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff15060006fffffffffffffffffffffffffffffffff60006fffffffffffffffffffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff15060007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x600054600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "150000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/CREATE_Bounds2OOG.json b/GeneralStateTests/stBoundsTest/CREATE_Bounds2OOG.json
new file mode 100644
index 000000000..7361a2a1c
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/CREATE_Bounds2OOG.json
@@ -0,0 +1,85 @@
+{
+    "CREATE_Bounds2OOG" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "61a215e6ac1c0d4618b1580592c49d82cbe7e04439ffeaab65b8d8aa82de242f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "61a215e6ac1c0d4618b1580592c49d82cbe7e04439ffeaab65b8d8aa82de242f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "61a215e6ac1c0d4618b1580592c49d82cbe7e04439ffeaab65b8d8aa82de242f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "61a215e6ac1c0d4618b1580592c49d82cbe7e04439ffeaab65b8d8aa82de242f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x64",
+                "code" : "0x7f6001600155601080600c6000396000f3006000355415600957005b60203560006000526035602053605560215363ffffffff60006001f0",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0fffffffffffffffffffffffffffffffffffffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "150000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "0"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/CREATE_Bounds3.json b/GeneralStateTests/stBoundsTest/CREATE_Bounds3.json
new file mode 100644
index 000000000..2ebb13cd3
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/CREATE_Bounds3.json
@@ -0,0 +1,85 @@
+{
+    "CREATE_Bounds3" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "164ddb6542196f7f7e2ce0fa8494451ede6e09bcea4980b8daf481d0e329e13f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "164ddb6542196f7f7e2ce0fa8494451ede6e09bcea4980b8daf481d0e329e13f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "164ddb6542196f7f7e2ce0fa8494451ede6e09bcea4980b8daf481d0e329e13f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "164ddb6542196f7f7e2ce0fa8494451ede6e09bcea4980b8daf481d0e329e13f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x64",
+                "code" : "0x7f6001600155601080600c6000396000f3006000355415600957005b60203560006000526035602053605560215367ffffffffffffffff60006001f0506fffffffffffffffffffffffffffffffff60006001f0507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60006001f0506000630fffffff6001f050600063ffffffff6001f050600067ffffffffffffffff6001f05060006fffffffffffffffffffffffffffffffff6001f05060007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001f050630fffffff630fffffff6001f05063ffffffff63ffffffff6001f05067ffffffffffffffff67ffffffffffffffff6001f0506fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6001f0507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001f0",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0fffffffffffffffffffffffffffffffffffffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "0x7fffffffffffffff"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "0"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/CREATE_Bounds3OOG.json b/GeneralStateTests/stBoundsTest/CREATE_Bounds3OOG.json
new file mode 100644
index 000000000..47a8e279c
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/CREATE_Bounds3OOG.json
@@ -0,0 +1,85 @@
+{
+    "CREATE_Bounds3OOG" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "6ffe73255873de6b521925fd688d790e78b08eda7ae1f97f04818fcb3f88ae65",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "6ffe73255873de6b521925fd688d790e78b08eda7ae1f97f04818fcb3f88ae65",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "6ffe73255873de6b521925fd688d790e78b08eda7ae1f97f04818fcb3f88ae65",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "6ffe73255873de6b521925fd688d790e78b08eda7ae1f97f04818fcb3f88ae65",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x64",
+                "code" : "0x7f6001600155601080600c6000396000f3006000355415600957005b60203560006000526035602053605560215367ffffffffffffffff60006001f0506fffffffffffffffffffffffffffffffff60006001f0507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60006001f0506000630fffffff6001f050600063ffffffff6001f050600067ffffffffffffffff6001f05060006fffffffffffffffffffffffffffffffff6001f05060007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001f050630fffffff630fffffff6001f05063ffffffff63ffffffff6001f05067ffffffffffffffff67ffffffffffffffff6001f0506fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6001f0507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6001f0",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0fffffffffffffffffffffffffffffffffffffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "150000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "0"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/CREATE_BoundsOOG.json b/GeneralStateTests/stBoundsTest/CREATE_BoundsOOG.json
new file mode 100644
index 000000000..92cd85a12
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/CREATE_BoundsOOG.json
@@ -0,0 +1,85 @@
+{
+    "CREATE_BoundsOOG" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "6f15d9a1eacf5b22ca0cd4f1f9c051b04deb72691f83bdbfb02deda51b0a7998",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "6f15d9a1eacf5b22ca0cd4f1f9c051b04deb72691f83bdbfb02deda51b0a7998",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "6f15d9a1eacf5b22ca0cd4f1f9c051b04deb72691f83bdbfb02deda51b0a7998",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "6f15d9a1eacf5b22ca0cd4f1f9c051b04deb72691f83bdbfb02deda51b0a7998",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x64",
+                "code" : "0x7f6001600155601080600c6000396000f3006000355415600957005b602035600060005260356020536055602153600060006001f050630fffffff60006001f0",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0fffffffffffffffffffffffffffffffffffffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "150000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "0"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/DELEGATECALL_Bounds2OOG.json b/GeneralStateTests/stBoundsTest/DELEGATECALL_Bounds2OOG.json
new file mode 100644
index 000000000..f2ba27cfe
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/DELEGATECALL_Bounds2OOG.json
@@ -0,0 +1,92 @@
+{
+    "DELEGATECALL_Bounds2OOG" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "168dba3b61e557e00a174dd4f0d35ad1fcd1c5ffabf0668e5313ed5c6a119911",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "168dba3b61e557e00a174dd4f0d35ad1fcd1c5ffabf0668e5313ed5c6a119911",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "168dba3b61e557e00a174dd4f0d35ad1fcd1c5ffabf0668e5313ed5c6a119911",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "168dba3b61e557e00a174dd4f0d35ad1fcd1c5ffabf0668e5313ed5c6a119911",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x63ffffffff63ffffffff63ffffffff63ffffffff7310000000000000000000000000000000000000016707fffffffffffffff4",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x600054600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "150000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/DELEGATECALL_Bounds3.json b/GeneralStateTests/stBoundsTest/DELEGATECALL_Bounds3.json
new file mode 100644
index 000000000..0dabbeef6
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/DELEGATECALL_Bounds3.json
@@ -0,0 +1,92 @@
+{
+    "DELEGATECALL_Bounds3" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "71ebbacc9f17fb53cf8a84e65eb5743bfb8a1819788f067e22926543fe57f999",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "71ebbacc9f17fb53cf8a84e65eb5743bfb8a1819788f067e22926543fe57f999",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "71ebbacc9f17fb53cf8a84e65eb5743bfb8a1819788f067e22926543fe57f999",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "71ebbacc9f17fb53cf8a84e65eb5743bfb8a1819788f067e22926543fe57f999",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x67ffffffffffffffff600067ffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff4506fffffffffffffffffffffffffffffffff60006fffffffffffffffffffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff4507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff45067ffffffffffffffff67ffffffffffffffff67ffffffffffffffff67ffffffffffffffff7310000000000000000000000000000000000000016707fffffffffffffff4506fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff7310000000000000000000000000000000000000016707fffffffffffffff4507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x600054600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "0x7fffffffffffffff"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/DELEGATECALL_Bounds3OOG.json b/GeneralStateTests/stBoundsTest/DELEGATECALL_Bounds3OOG.json
new file mode 100644
index 000000000..7a8360e61
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/DELEGATECALL_Bounds3OOG.json
@@ -0,0 +1,92 @@
+{
+    "DELEGATECALL_Bounds3OOG" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "f793b64000efb8c77680f6f8027b23cc505dfeaff9c606c1cca06f1720590ee0",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "f793b64000efb8c77680f6f8027b23cc505dfeaff9c606c1cca06f1720590ee0",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "f793b64000efb8c77680f6f8027b23cc505dfeaff9c606c1cca06f1720590ee0",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "f793b64000efb8c77680f6f8027b23cc505dfeaff9c606c1cca06f1720590ee0",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x67ffffffffffffffff600067ffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff4506fffffffffffffffffffffffffffffffff60006fffffffffffffffffffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff4507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007310000000000000000000000000000000000000016707fffffffffffffff45067ffffffffffffffff67ffffffffffffffff67ffffffffffffffff67ffffffffffffffff7310000000000000000000000000000000000000016707fffffffffffffff4506fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff7310000000000000000000000000000000000000016707fffffffffffffff4507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x600054600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "150000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/DELEGATECALL_BoundsOOG.json b/GeneralStateTests/stBoundsTest/DELEGATECALL_BoundsOOG.json
new file mode 100644
index 000000000..278d1d282
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/DELEGATECALL_BoundsOOG.json
@@ -0,0 +1,92 @@
+{
+    "DELEGATECALL_BoundsOOG" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "4d56f30a043369eff456aa1bafdbbe3f564ab2d2a8ba46c91c3c84df091e944a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "4d56f30a043369eff456aa1bafdbbe3f564ab2d2a8ba46c91c3c84df091e944a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "4d56f30a043369eff456aa1bafdbbe3f564ab2d2a8ba46c91c3c84df091e944a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "4d56f30a043369eff456aa1bafdbbe3f564ab2d2a8ba46c91c3c84df091e944a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60006000600060007310000000000000000000000000000000000000016707fffffffffffffff450630fffffff6000630fffffff60007310000000000000000000000000000000000000016707fffffffffffffff45063ffffffff600063ffffffff60007310000000000000000000000000000000000000016707fffffffffffffff4506000630fffffff6000630fffffff7310000000000000000000000000000000000000016707fffffffffffffff450600063ffffffff600063ffffffff7310000000000000000000000000000000000000016707fffffffffffffff450600067ffffffffffffffff600067ffffffffffffffff7310000000000000000000000000000000000000016707fffffffffffffff45060006fffffffffffffffffffffffffffffffff60006fffffffffffffffffffffffffffffffff7310000000000000000000000000000000000000016707fffffffffffffff45060007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff60007fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7310000000000000000000000000000000000000016707fffffffffffffff450630fffffff630fffffff630fffffff630fffffff7310000000000000000000000000000000000000016707fffffffffffffff4",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x600054600101600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "150000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/DUP_Bounds.json b/GeneralStateTests/stBoundsTest/DUP_Bounds.json
new file mode 100644
index 000000000..4c2eb213c
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/DUP_Bounds.json
@@ -0,0 +1,85 @@
+{
+    "DUP_Bounds" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "3517f5387debc5089461049cb26d946ba072bd2b1dd00c2c45248a3b32686855",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "3517f5387debc5089461049cb26d946ba072bd2b1dd00c2c45248a3b32686855",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "3517f5387debc5089461049cb26d946ba072bd2b1dd00c2c45248a3b32686855",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "3517f5387debc5089461049cb26d946ba072bd2b1dd00c2c45248a3b32686855",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600080505063ffffffff80505067ffffffffffffffff8050506fffffffffffffffffffffffffffffffff8050507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff805050600060008150505063ffffffff63ffffffff8150505067ffffffffffffffff67ffffffffffffffff815050506fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff815050507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff81505050600060006000825050505063ffffffff63ffffffff63ffffffff825050505067ffffffffffffffff67ffffffffffffffff67ffffffffffffffff82505050506fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff82505050507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8250505050600060006000600083505050505063ffffffff63ffffffff63ffffffff63ffffffff83505050505067ffffffffffffffff67ffffffffff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x7fffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "0x7ffffffffffffff0"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/DUP_BoundsOOG.json b/GeneralStateTests/stBoundsTest/DUP_BoundsOOG.json
new file mode 100644
index 000000000..5cd7cda90
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/DUP_BoundsOOG.json
@@ -0,0 +1,85 @@
+{
+    "DUP_BoundsOOG" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "3517f5387debc5089461049cb26d946ba072bd2b1dd00c2c45248a3b32686855",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "3517f5387debc5089461049cb26d946ba072bd2b1dd00c2c45248a3b32686855",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "3517f5387debc5089461049cb26d946ba072bd2b1dd00c2c45248a3b32686855",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "3517f5387debc5089461049cb26d946ba072bd2b1dd00c2c45248a3b32686855",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600080505063ffffffff80505067ffffffffffffffff8050506fffffffffffffffffffffffffffffffff8050507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff805050600060008150505063ffffffff63ffffffff8150505067ffffffffffffffff67ffffffffffffffff815050506fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff815050507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff81505050600060006000825050505063ffffffff63ffffffff63ffffffff825050505067ffffffffffffffff67ffffffffffffffff67ffffffffffffffff82505050506fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff6fffffffffffffffffffffffffffffffff82505050507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8250505050600060006000600083505050505063ffffffff63ffffffff63ffffffff63ffffffff83505050505067ffffffffffffffff67ffffffffff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x7fffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "150000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/JUMPI_Bounds.json b/GeneralStateTests/stBoundsTest/JUMPI_Bounds.json
new file mode 100644
index 000000000..f8b3fed4f
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/JUMPI_Bounds.json
@@ -0,0 +1,85 @@
+{
+    "JUMPI_Bounds" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "b084216e6d76acf17db662f0de4991abef7c9d2640122ac54b775781efa05f52",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "b084216e6d76acf17db662f0de4991abef7c9d2640122ac54b775781efa05f52",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "b084216e6d76acf17db662f0de4991abef7c9d2640122ac54b775781efa05f52",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "b084216e6d76acf17db662f0de4991abef7c9d2640122ac54b775781efa05f52",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600163ffffffff57600167ffffffffffffffff5760016fffffffffffffffffffffffffffffffff5760017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff57",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x7fffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "0x7fffffffffffffff"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/JUMPI_BoundsOOG.json b/GeneralStateTests/stBoundsTest/JUMPI_BoundsOOG.json
new file mode 100644
index 000000000..68dc54ef4
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/JUMPI_BoundsOOG.json
@@ -0,0 +1,85 @@
+{
+    "JUMPI_BoundsOOG" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "8f4527b62b6584296e56720c079334a402880d2532b78190432d599575d238d6",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "8f4527b62b6584296e56720c079334a402880d2532b78190432d599575d238d6",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "8f4527b62b6584296e56720c079334a402880d2532b78190432d599575d238d6",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "8f4527b62b6584296e56720c079334a402880d2532b78190432d599575d238d6",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600163ffffffff57600167ffffffffffffffff5760016fffffffffffffffffffffffffffffffff5760017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff57",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x7fffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "150000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/JUMP_Bounds.json b/GeneralStateTests/stBoundsTest/JUMP_Bounds.json
new file mode 100644
index 000000000..9a15d18cb
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/JUMP_Bounds.json
@@ -0,0 +1,85 @@
+{
+    "JUMP_Bounds" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "2e31fd2fea505bb5cda0dca0482f8229861c1876db24a83555ae9685cb50ac9a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "2e31fd2fea505bb5cda0dca0482f8229861c1876db24a83555ae9685cb50ac9a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "2e31fd2fea505bb5cda0dca0482f8229861c1876db24a83555ae9685cb50ac9a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "2e31fd2fea505bb5cda0dca0482f8229861c1876db24a83555ae9685cb50ac9a",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600056",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x7fffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "0x7fffffffffffffff"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/JUMP_Bounds2.json b/GeneralStateTests/stBoundsTest/JUMP_Bounds2.json
new file mode 100644
index 000000000..2e4b0a2f5
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/JUMP_Bounds2.json
@@ -0,0 +1,85 @@
+{
+    "JUMP_Bounds2" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "75784d5e238680171e7df34f983743c19e5263e8088aec535dcfdb57af2c6982",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "75784d5e238680171e7df34f983743c19e5263e8088aec535dcfdb57af2c6982",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "75784d5e238680171e7df34f983743c19e5263e8088aec535dcfdb57af2c6982",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "75784d5e238680171e7df34f983743c19e5263e8088aec535dcfdb57af2c6982",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x63ffffffff5667ffffffffffffffff566fffffffffffffffffffffffffffffffff567fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff56",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x7fffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "0x7fffffffffffffff"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/JUMP_Bounds2OOG.json b/GeneralStateTests/stBoundsTest/JUMP_Bounds2OOG.json
new file mode 100644
index 000000000..686a7aa16
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/JUMP_Bounds2OOG.json
@@ -0,0 +1,85 @@
+{
+    "JUMP_Bounds2OOG" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "47f5783b17068d6fc8900cd43707d2f650444b65a4d53a2500f632903e07a3b9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "47f5783b17068d6fc8900cd43707d2f650444b65a4d53a2500f632903e07a3b9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "47f5783b17068d6fc8900cd43707d2f650444b65a4d53a2500f632903e07a3b9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "47f5783b17068d6fc8900cd43707d2f650444b65a4d53a2500f632903e07a3b9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x63ffffffff5667ffffffffffffffff566fffffffffffffffffffffffffffffffff567fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff56",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x7fffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "150000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/JUMP_BoundsOOG.json b/GeneralStateTests/stBoundsTest/JUMP_BoundsOOG.json
new file mode 100644
index 000000000..1a87aa9e7
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/JUMP_BoundsOOG.json
@@ -0,0 +1,85 @@
+{
+    "JUMP_BoundsOOG" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "7a6e4d1a26f1bb28074ee0b95e06e764eaf8b040634c23db3033f9fdc3566411",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "7a6e4d1a26f1bb28074ee0b95e06e764eaf8b040634c23db3033f9fdc3566411",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "7a6e4d1a26f1bb28074ee0b95e06e764eaf8b040634c23db3033f9fdc3566411",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "7a6e4d1a26f1bb28074ee0b95e06e764eaf8b040634c23db3033f9fdc3566411",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600056",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x7fffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "150000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/MLOAD_Bounds2.json b/GeneralStateTests/stBoundsTest/MLOAD_Bounds2.json
new file mode 100644
index 000000000..24d70fbaf
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/MLOAD_Bounds2.json
@@ -0,0 +1,85 @@
+{
+    "MLOAD_Bounds2" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "cbcf854d323104799cf22241ba42b9b64403a3a8c6d40ebd1f4ec88e00ef3dcf",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "cbcf854d323104799cf22241ba42b9b64403a3a8c6d40ebd1f4ec88e00ef3dcf",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "cbcf854d323104799cf22241ba42b9b64403a3a8c6d40ebd1f4ec88e00ef3dcf",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "cbcf854d323104799cf22241ba42b9b64403a3a8c6d40ebd1f4ec88e00ef3dcf",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x67ffffffffffffffff51506fffffffffffffffffffffffffffffffff51507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff51",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x07ffffffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "0x7fffffffffffffff"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/MLOAD_Bounds2OOG.json b/GeneralStateTests/stBoundsTest/MLOAD_Bounds2OOG.json
new file mode 100644
index 000000000..dd993a032
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/MLOAD_Bounds2OOG.json
@@ -0,0 +1,85 @@
+{
+    "MLOAD_Bounds2OOG" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "5775640d1beda0d6cab5f52fcdb0022e50a338820e2a968d5723cc8ef84a8072",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "5775640d1beda0d6cab5f52fcdb0022e50a338820e2a968d5723cc8ef84a8072",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "5775640d1beda0d6cab5f52fcdb0022e50a338820e2a968d5723cc8ef84a8072",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "5775640d1beda0d6cab5f52fcdb0022e50a338820e2a968d5723cc8ef84a8072",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x67ffffffffffffffff51506fffffffffffffffffffffffffffffffff51507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff51",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x07ffffffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "150000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/MLOAD_Bounds3OOG.json b/GeneralStateTests/stBoundsTest/MLOAD_Bounds3OOG.json
new file mode 100644
index 000000000..94bc985c8
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/MLOAD_Bounds3OOG.json
@@ -0,0 +1,85 @@
+{
+    "MLOAD_Bounds3OOG" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "c69844d2cc49df9fed514a6def59271d67c9809f36a07e3971f08b3eca9d7fad",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "c69844d2cc49df9fed514a6def59271d67c9809f36a07e3971f08b3eca9d7fad",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "c69844d2cc49df9fed514a6def59271d67c9809f36a07e3971f08b3eca9d7fad",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "c69844d2cc49df9fed514a6def59271d67c9809f36a07e3971f08b3eca9d7fad",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x64ffffffffff51",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x07ffffffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "150000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/MLOAD_BoundsOOG.json b/GeneralStateTests/stBoundsTest/MLOAD_BoundsOOG.json
new file mode 100644
index 000000000..c7ff19062
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/MLOAD_BoundsOOG.json
@@ -0,0 +1,85 @@
+{
+    "MLOAD_BoundsOOG" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "4b69b20c52e1149e524f8f5ec7369f6fdbe993d2262bdb80be329e65ffb232d0",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "4b69b20c52e1149e524f8f5ec7369f6fdbe993d2262bdb80be329e65ffb232d0",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "4b69b20c52e1149e524f8f5ec7369f6fdbe993d2262bdb80be329e65ffb232d0",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "4b69b20c52e1149e524f8f5ec7369f6fdbe993d2262bdb80be329e65ffb232d0",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000515063ffffffff51",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x07ffffffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "150000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/MSTORE_Bounds.json b/GeneralStateTests/stBoundsTest/MSTORE_Bounds.json
new file mode 100644
index 000000000..9b5ac2ee4
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/MSTORE_Bounds.json
@@ -0,0 +1,85 @@
+{
+    "MSTORE_Bounds" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "a5c6407603c7d7292abed70ffa74dbadef1ca707e9bdd69e966bbe4671aeb530",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "a5c6407603c7d7292abed70ffa74dbadef1ca707e9bdd69e966bbe4671aeb530",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "a5c6407603c7d7292abed70ffa74dbadef1ca707e9bdd69e966bbe4671aeb530",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "a5c6407603c7d7292abed70ffa74dbadef1ca707e9bdd69e966bbe4671aeb530",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600167ffffffffffffffff52",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "0x7ffffffffffffff0"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/MSTORE_Bounds2.json b/GeneralStateTests/stBoundsTest/MSTORE_Bounds2.json
new file mode 100644
index 000000000..4e9eeccef
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/MSTORE_Bounds2.json
@@ -0,0 +1,85 @@
+{
+    "MSTORE_Bounds2" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "5d4cd1c3cf0fddfd066a9502c78d71ea383e82613fc90a1bd7e29fba74f9f29d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "5d4cd1c3cf0fddfd066a9502c78d71ea383e82613fc90a1bd7e29fba74f9f29d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "5d4cd1c3cf0fddfd066a9502c78d71ea383e82613fc90a1bd7e29fba74f9f29d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "5d4cd1c3cf0fddfd066a9502c78d71ea383e82613fc90a1bd7e29fba74f9f29d",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600164ffffffffff52",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "150000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/MSTORE_BoundsOOG.json b/GeneralStateTests/stBoundsTest/MSTORE_BoundsOOG.json
new file mode 100644
index 000000000..ad2500402
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/MSTORE_BoundsOOG.json
@@ -0,0 +1,85 @@
+{
+    "MSTORE_BoundsOOG" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "41c9cd8313c66d7def51f431c90a285b3c3eb3949696d370fb85e96d1669dc91",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "41c9cd8313c66d7def51f431c90a285b3c3eb3949696d370fb85e96d1669dc91",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "41c9cd8313c66d7def51f431c90a285b3c3eb3949696d370fb85e96d1669dc91",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "41c9cd8313c66d7def51f431c90a285b3c3eb3949696d370fb85e96d1669dc91",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600167ffffffffffffffff52",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "150000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/POP_Bounds.json b/GeneralStateTests/stBoundsTest/POP_Bounds.json
new file mode 100644
index 000000000..c1ab79913
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/POP_Bounds.json
@@ -0,0 +1,85 @@
+{
+    "POP_Bounds" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "2a531e6edd87959eaf0ff10384e3b6e663bdc6160bf6f0efd63a988b77d2a33f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "2a531e6edd87959eaf0ff10384e3b6e663bdc6160bf6f0efd63a988b77d2a33f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "2a531e6edd87959eaf0ff10384e3b6e663bdc6160bf6f0efd63a988b77d2a33f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "2a531e6edd87959eaf0ff10384e3b6e663bdc6160bf6f0efd63a988b77d2a33f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60005063ffffffff5067ffffffffffffffff506fffffffffffffffffffffffffffffffff507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff50",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x07ffffffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "0x7fffffffffffffff"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/POP_BoundsOOG.json b/GeneralStateTests/stBoundsTest/POP_BoundsOOG.json
new file mode 100644
index 000000000..f9fd31512
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/POP_BoundsOOG.json
@@ -0,0 +1,85 @@
+{
+    "POP_BoundsOOG" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "2a531e6edd87959eaf0ff10384e3b6e663bdc6160bf6f0efd63a988b77d2a33f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "2a531e6edd87959eaf0ff10384e3b6e663bdc6160bf6f0efd63a988b77d2a33f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "2a531e6edd87959eaf0ff10384e3b6e663bdc6160bf6f0efd63a988b77d2a33f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "2a531e6edd87959eaf0ff10384e3b6e663bdc6160bf6f0efd63a988b77d2a33f",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60005063ffffffff5067ffffffffffffffff506fffffffffffffffffffffffffffffffff507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff50",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x07ffffffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "150000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/RETURN_Bounds.json b/GeneralStateTests/stBoundsTest/RETURN_Bounds.json
new file mode 100644
index 000000000..3f1c6618c
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/RETURN_Bounds.json
@@ -0,0 +1,197 @@
+{
+    "RETURN_Bounds" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "721034ad65ef7a1104351c296dd0d7f1bf6fc37cf7cef361f51b6d714d7afb39",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "721034ad65ef7a1104351c296dd0d7f1bf6fc37cf7cef361f51b6d714d7afb39",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "5ba00bb0f767ef04e809f4e3268ae48dadc2b75c059af88059975f6d83e1e6bb",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "5ba00bb0f767ef04e809f4e3268ae48dadc2b75c059af88059975f6d83e1e6bb",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600060007310000000000000000000000000000000000000016707fffffffffffffff1600155600060006000600060007310000000000000000000000000000000000000026707fffffffffffffff1600255600060006000600060007310000000000000000000000000000000000000036707fffffffffffffff1600355600060006000600060007310000000000000000000000000000000000000046707fffffffffffffff1600455600060006000600060007310000000000000000000000000000000000000056707fffffffffffffff1600555600060006000600060007310000000000000000000000000000000000000066707fffffffffffffff1600655600060006000600060007310000000000000000000000000000000000000066707fffffffffffffff1600755600060006000600060007310000000000000000000000000000000000000066707fffffffffffffff1600855600060006000600060007310000000000000000000000000000000000000066707fffffffffffffff1600955600060006000600060007310000000000000000000000000000000000000066707fffffffffffffff1600a55600060006000600060007310000000000000000000000000000000000000066707fffffffffffffff1600b55600060006000600060007310000000000000000000000000000000",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60006000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x6000630ffffffff3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x600063fffffffff3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000004" : {
+                "balance" : "0x00",
+                "code" : "0x600067fffffffffffffffff3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000005" : {
+                "balance" : "0x00",
+                "code" : "0x60006d0ffffffffffffffffffffffffffff3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000006" : {
+                "balance" : "0x00",
+                "code" : "0x60007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000007" : {
+                "balance" : "0x00",
+                "code" : "0x630fffffff6000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000008" : {
+                "balance" : "0x00",
+                "code" : "0x63ffffffff6000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000009" : {
+                "balance" : "0x00",
+                "code" : "0x67ffffffffffffffff6000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000010" : {
+                "balance" : "0x00",
+                "code" : "0x6d0fffffffffffffffffffffffffff6000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000011" : {
+                "balance" : "0x00",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000012" : {
+                "balance" : "0x00",
+                "code" : "0x630fffffff630ffffffff3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000013" : {
+                "balance" : "0x00",
+                "code" : "0x63ffffffff63fffffffff3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000014" : {
+                "balance" : "0x00",
+                "code" : "0x67ffffffffffffffff67fffffffffffffffff3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000015" : {
+                "balance" : "0x00",
+                "code" : "0x6d0fffffffffffffffffffffffffff6d0ffffffffffffffffffffffffffff3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000016" : {
+                "balance" : "0x00",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "0x7fffffffffffffff"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/RETURN_BoundsOOG.json b/GeneralStateTests/stBoundsTest/RETURN_BoundsOOG.json
new file mode 100644
index 000000000..1e2fb4df1
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/RETURN_BoundsOOG.json
@@ -0,0 +1,197 @@
+{
+    "RETURN_BoundsOOG" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "9bac205f0499a5554fbee863d508575c327b4c9c3f1ca2950a0a391b0bc10354",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "9bac205f0499a5554fbee863d508575c327b4c9c3f1ca2950a0a391b0bc10354",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "9bac205f0499a5554fbee863d508575c327b4c9c3f1ca2950a0a391b0bc10354",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "9bac205f0499a5554fbee863d508575c327b4c9c3f1ca2950a0a391b0bc10354",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600060007310000000000000000000000000000000000000016707fffffffffffffff1600155600060006000600060007310000000000000000000000000000000000000026707fffffffffffffff1600255600060006000600060007310000000000000000000000000000000000000036707fffffffffffffff1600355600060006000600060007310000000000000000000000000000000000000046707fffffffffffffff1600455600060006000600060007310000000000000000000000000000000000000056707fffffffffffffff1600555600060006000600060007310000000000000000000000000000000000000066707fffffffffffffff1600655600060006000600060007310000000000000000000000000000000000000066707fffffffffffffff1600755600060006000600060007310000000000000000000000000000000000000066707fffffffffffffff1600855600060006000600060007310000000000000000000000000000000000000066707fffffffffffffff1600955600060006000600060007310000000000000000000000000000000000000066707fffffffffffffff1600a55600060006000600060007310000000000000000000000000000000000000066707fffffffffffffff1600b55600060006000600060007310000000000000000000000000000000",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60006000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x6000630ffffffff3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x600063fffffffff3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000004" : {
+                "balance" : "0x00",
+                "code" : "0x600067fffffffffffffffff3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000005" : {
+                "balance" : "0x00",
+                "code" : "0x60006d0ffffffffffffffffffffffffffff3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000006" : {
+                "balance" : "0x00",
+                "code" : "0x60007ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000007" : {
+                "balance" : "0x00",
+                "code" : "0x630fffffff6000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000008" : {
+                "balance" : "0x00",
+                "code" : "0x63ffffffff6000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000009" : {
+                "balance" : "0x00",
+                "code" : "0x67ffffffffffffffff6000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000010" : {
+                "balance" : "0x00",
+                "code" : "0x6d0fffffffffffffffffffffffffff6000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000011" : {
+                "balance" : "0x00",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000012" : {
+                "balance" : "0x00",
+                "code" : "0x630fffffff630ffffffff3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000013" : {
+                "balance" : "0x00",
+                "code" : "0x63ffffffff63fffffffff3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000014" : {
+                "balance" : "0x00",
+                "code" : "0x67ffffffffffffffff67fffffffffffffffff3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000015" : {
+                "balance" : "0x00",
+                "code" : "0x6d0fffffffffffffffffffffffffff6d0ffffffffffffffffffffffffffff3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "1000000000000000000000000000000000000016" : {
+                "balance" : "0x00",
+                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "150000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/SLOAD_Bounds.json b/GeneralStateTests/stBoundsTest/SLOAD_Bounds.json
new file mode 100644
index 000000000..477ad3a85
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/SLOAD_Bounds.json
@@ -0,0 +1,85 @@
+{
+    "SLOAD_Bounds" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "b1462c18aee1c775e510a0b352a2f8f199881fb094a312f7beabfe40ad50d16e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "b1462c18aee1c775e510a0b352a2f8f199881fb094a312f7beabfe40ad50d16e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "1ead9fb677a23877d03e57fee917c54a61b1cdacb5cb730cd2dea5154795c1ab",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "1ead9fb677a23877d03e57fee917c54a61b1cdacb5cb730cd2dea5154795c1ab",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000545063ffffffff545067ffffffffffffffff54506fffffffffffffffffffffffffffffffff54507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff54",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x07ffffffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "0x7fffffffffffffff"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/SLOAD_BoundsOOG.json b/GeneralStateTests/stBoundsTest/SLOAD_BoundsOOG.json
new file mode 100644
index 000000000..836234e4f
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/SLOAD_BoundsOOG.json
@@ -0,0 +1,85 @@
+{
+    "SLOAD_BoundsOOG" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "b1462c18aee1c775e510a0b352a2f8f199881fb094a312f7beabfe40ad50d16e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "b1462c18aee1c775e510a0b352a2f8f199881fb094a312f7beabfe40ad50d16e",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "1ead9fb677a23877d03e57fee917c54a61b1cdacb5cb730cd2dea5154795c1ab",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "1ead9fb677a23877d03e57fee917c54a61b1cdacb5cb730cd2dea5154795c1ab",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x6000545063ffffffff545067ffffffffffffffff54506fffffffffffffffffffffffffffffffff54507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff54",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x07ffffffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "150000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/SSTORE_Bounds.json b/GeneralStateTests/stBoundsTest/SSTORE_Bounds.json
new file mode 100644
index 000000000..6bc615a22
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/SSTORE_Bounds.json
@@ -0,0 +1,85 @@
+{
+    "SSTORE_Bounds" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "2af2733cdea16f85dfb3360686a89712a8cae12e7b2e350b774f995d032718b9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "2af2733cdea16f85dfb3360686a89712a8cae12e7b2e350b774f995d032718b9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "2af2733cdea16f85dfb3360686a89712a8cae12e7b2e350b774f995d032718b9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "2af2733cdea16f85dfb3360686a89712a8cae12e7b2e350b774f995d032718b9",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600163ffffffff55600167ffffffffffffffff5560016fffffffffffffffffffffffffffffffff5560017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5563ffffffff60205567ffffffffffffffff6040556fffffffffffffffffffffffffffffffff6080557fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff61010055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x07ffffffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "0x7fffffffffffffff"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stBoundsTest/SSTORE_BoundsOOG.json b/GeneralStateTests/stBoundsTest/SSTORE_BoundsOOG.json
new file mode 100644
index 000000000..01d560547
--- /dev/null
+++ b/GeneralStateTests/stBoundsTest/SSTORE_BoundsOOG.json
@@ -0,0 +1,85 @@
+{
+    "SSTORE_BoundsOOG" : {
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x02b8feb0",
+            "currentGasLimit" : "0x7fffffffffffffff",
+            "currentNumber" : "0x118c30",
+            "currentTimestamp" : "0x01",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "post" : {
+            "EIP150" : [
+                {
+                    "hash" : "a490aaac545ffb621eb0f87dce5693d3cac69a094dfea4b5cc9f29a2d7d09b28",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "EIP158" : [
+                {
+                    "hash" : "a490aaac545ffb621eb0f87dce5693d3cac69a094dfea4b5cc9f29a2d7d09b28",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Frontier" : [
+                {
+                    "hash" : "a490aaac545ffb621eb0f87dce5693d3cac69a094dfea4b5cc9f29a2d7d09b28",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ],
+            "Homestead" : [
+                {
+                    "hash" : "a490aaac545ffb621eb0f87dce5693d3cac69a094dfea4b5cc9f29a2d7d09b28",
+                    "indexes" : {
+                        "data" : 0,
+                        "gas" : 0,
+                        "value" : 0
+                    }
+                }
+            ]
+        },
+        "pre" : {
+            "1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x600163ffffffff55600167ffffffffffffffff5560016fffffffffffffffffffffffffffffffff5560017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff5563ffffffff60205567ffffffffffffffff6040556fffffffffffffffffffffffffffffffff6080557fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff61010055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x07ffffffffffffffffff",
+                "code" : "0x",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "150000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "1000000000000000000000000000000000000000",
+            "value" : [
+                "1"
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024OOG.json b/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024OOG.json
index 0324327ed..dd5521447 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024OOG.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/Callcode1024OOG.json
@@ -26,6 +26,39 @@
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0xffffffffffffffffffffffffffc577f1",
+                            "code" : "0x",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        },
+                        "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x1b58",
+                            "code" : "0x",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x3a8804",
+                            "code" : "0x",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x040a",
+                            "code" : "0x6001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f26001556103e860005402600101600255",
+                            "nonce" : "0x00",
+                            "storage" : {
+                                "0x00" : "0x85",
+                                "0x01" : "0x01",
+                                "0x02" : "0x020789"
+                            }
+                        }
                     }
                 }
             ],
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/CallcodeLoseGasOOG.json b/GeneralStateTests/stCallCreateCallCodeTest/CallcodeLoseGasOOG.json
index 9c86e8fe8..3d777ec46 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/CallcodeLoseGasOOG.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/CallcodeLoseGasOOG.json
@@ -26,6 +26,36 @@
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0xfffffffffffffffffffffffffffd7689",
+                            "code" : "0x",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        },
+                        "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x1b58",
+                            "code" : "0x",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x028976",
+                            "code" : "0x",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x0400",
+                            "code" : "0x6001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f26001556103e860005402600101600255",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        }
                     }
                 }
             ],
diff --git a/GeneralStateTests/stCallCreateCallCodeTest/createFailBalanceTooLow.json b/GeneralStateTests/stCallCreateCallCodeTest/createFailBalanceTooLow.json
index 5ae5a9c79..1ee506245 100644
--- a/GeneralStateTests/stCallCreateCallCodeTest/createFailBalanceTooLow.json
+++ b/GeneralStateTests/stCallCreateCallCodeTest/createFailBalanceTooLow.json
@@ -26,6 +26,29 @@
                         "data" : 0,
                         "gas" : 0,
                         "value" : 0
+                    },
+                    "postState" : {
+                        "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                            "balance" : "0x0de0b6b3a7640000",
+                            "code" : "0x605a60005360016000670de0b6b3a7640018f0ff",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                            "balance" : "0xcf1d",
+                            "code" : "0x",
+                            "nonce" : "0x00",
+                            "storage" : {
+                            }
+                        },
+                        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                            "balance" : "0x0de0b6b3a76330e3",
+                            "code" : "0x",
+                            "nonce" : "0x01",
+                            "storage" : {
+                            }
+                        }
                     }
                 }
             ],
diff --git a/src/GeneralStateTestsFiller/stBlockHashTest/blockhashDOS-sec71Filler.json b/src/GeneralStateTestsFiller/stBlockHashTest/blockhashDOS-sec71Filler.json
index c018eba7b..fbddf92bb 100644
--- a/src/GeneralStateTestsFiller/stBlockHashTest/blockhashDOS-sec71Filler.json
+++ b/src/GeneralStateTestsFiller/stBlockHashTest/blockhashDOS-sec71Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : "ALL",
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "balance" : "0x3b8f5850"
@@ -55,4 +55,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stBlockHashTest/blockhashInRangeFiller.json b/src/GeneralStateTestsFiller/stBlockHashTest/blockhashInRangeFiller.json
index 29a044ec4..de2e7810c 100644
--- a/src/GeneralStateTestsFiller/stBlockHashTest/blockhashInRangeFiller.json
+++ b/src/GeneralStateTestsFiller/stBlockHashTest/blockhashInRangeFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : "ALL",
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
@@ -59,4 +59,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stBlockHashTest/blockhashJITFiller.json b/src/GeneralStateTestsFiller/stBlockHashTest/blockhashJITFiller.json
index 9ed17fbc7..4eab80b88 100644
--- a/src/GeneralStateTestsFiller/stBlockHashTest/blockhashJITFiller.json
+++ b/src/GeneralStateTestsFiller/stBlockHashTest/blockhashJITFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : "ALL",
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
@@ -58,4 +58,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stBlockHashTest/blockhashOutOfRangeFiller.json b/src/GeneralStateTestsFiller/stBlockHashTest/blockhashOutOfRangeFiller.json
index 1c73011c0..390f32585 100644
--- a/src/GeneralStateTestsFiller/stBlockHashTest/blockhashOutOfRangeFiller.json
+++ b/src/GeneralStateTestsFiller/stBlockHashTest/blockhashOutOfRangeFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : "ALL",
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
@@ -56,4 +56,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/BLOCKHASH_BoundsFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/BLOCKHASH_BoundsFiller.json
index 7e6953dc1..3a6573458 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/BLOCKHASH_BoundsFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/BLOCKHASH_BoundsFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "1"
@@ -55,4 +55,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/BLOCKHASH_BoundsOOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/BLOCKHASH_BoundsOOGFiller.json
index 45ddc371e..234536c21 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/BLOCKHASH_BoundsOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/BLOCKHASH_BoundsOOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "1"
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_Bounds2OOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_Bounds2OOGFiller.json
index d1a904aab..cdf600ad6 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_Bounds2OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_Bounds2OOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "0",
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_Bounds3OOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_Bounds3OOGFiller.json
index e0713955e..95a55b77a 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_Bounds3OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_Bounds3OOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "0",
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_Bounds4Filler.json b/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_Bounds4Filler.json
index 5f2fd39c1..b43c2de4a 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_Bounds4Filler.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_Bounds4Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "0",
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_Bounds4OOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_Bounds4OOGFiller.json
index 32aeba48f..9643ff34a 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_Bounds4OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_Bounds4OOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "0",
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_BoundsOOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_BoundsOOGFiller.json
index 49cbe9c3d..ea88e58fd 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_BoundsOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/CALLCODE_BoundsOOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "0",
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/CALL_Bounds2OOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/CALL_Bounds2OOGFiller.json
index d5e01fda3..e4fe6d42e 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/CALL_Bounds2OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/CALL_Bounds2OOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "0"
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/CALL_Bounds2aOOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/CALL_Bounds2aOOGFiller.json
index f6561202d..7177870e3 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/CALL_Bounds2aOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/CALL_Bounds2aOOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "0"
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/CALL_Bounds3Filler.json b/src/GeneralStateTestsFiller/stBoundsTest/CALL_Bounds3Filler.json
index 9c7a4d688..bf43daf7d 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/CALL_Bounds3Filler.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/CALL_Bounds3Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "0"
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/CALL_Bounds3OOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/CALL_Bounds3OOGFiller.json
index a702d69f7..b45866887 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/CALL_Bounds3OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/CALL_Bounds3OOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "0"
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/CALL_BoundsOOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/CALL_BoundsOOGFiller.json
index 50258d123..2fcf6e7f3 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/CALL_BoundsOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/CALL_BoundsOOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "0"
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/CREATE_Bounds2OOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/CREATE_Bounds2OOGFiller.json
index e4f32eada..261bf945b 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/CREATE_Bounds2OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/CREATE_Bounds2OOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "100"
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/CREATE_Bounds3Filler.json b/src/GeneralStateTestsFiller/stBoundsTest/CREATE_Bounds3Filler.json
index 5e557c3af..bb3008143 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/CREATE_Bounds3Filler.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/CREATE_Bounds3Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "100"
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/CREATE_Bounds3OOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/CREATE_Bounds3OOGFiller.json
index 3bb4eef40..00cf6cd7d 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/CREATE_Bounds3OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/CREATE_Bounds3OOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "100"
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/CREATE_BoundsOOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/CREATE_BoundsOOGFiller.json
index 56cbd956e..9cf20392c 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/CREATE_BoundsOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/CREATE_BoundsOOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "100"
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/DELEGATECALL_Bounds2OOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/DELEGATECALL_Bounds2OOGFiller.json
index bf1d87ff1..25f0f2620 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/DELEGATECALL_Bounds2OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/DELEGATECALL_Bounds2OOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "0",
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/DELEGATECALL_Bounds3Filler.json b/src/GeneralStateTestsFiller/stBoundsTest/DELEGATECALL_Bounds3Filler.json
index 2192c978c..ed9148b10 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/DELEGATECALL_Bounds3Filler.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/DELEGATECALL_Bounds3Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "0",
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/DELEGATECALL_Bounds3OOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/DELEGATECALL_Bounds3OOGFiller.json
index 381296fdb..f644f083b 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/DELEGATECALL_Bounds3OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/DELEGATECALL_Bounds3OOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "0",
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/DELEGATECALL_BoundsOOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/DELEGATECALL_BoundsOOGFiller.json
index e8bcb3ddc..b8668fc62 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/DELEGATECALL_BoundsOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/DELEGATECALL_BoundsOOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "0",
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/DUP_BoundsFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/DUP_BoundsFiller.json
index b2a821ca1..a84c8bcc7 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/DUP_BoundsFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/DUP_BoundsFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "1"
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/DUP_BoundsOOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/DUP_BoundsOOGFiller.json
index 9d1f36480..8e66f1c11 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/DUP_BoundsOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/DUP_BoundsOOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "1"
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/JUMPI_BoundsFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/JUMPI_BoundsFiller.json
index 401b5c238..4b44f49fb 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/JUMPI_BoundsFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/JUMPI_BoundsFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "0",
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/JUMPI_BoundsOOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/JUMPI_BoundsOOGFiller.json
index eca867127..09689e641 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/JUMPI_BoundsOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/JUMPI_BoundsOOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "0",
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/JUMP_Bounds2Filler.json b/src/GeneralStateTestsFiller/stBoundsTest/JUMP_Bounds2Filler.json
index d081d9f21..12991b1de 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/JUMP_Bounds2Filler.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/JUMP_Bounds2Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "0",
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/JUMP_Bounds2OOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/JUMP_Bounds2OOGFiller.json
index b8ccdd981..c352567e8 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/JUMP_Bounds2OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/JUMP_Bounds2OOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "0",
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/JUMP_BoundsFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/JUMP_BoundsFiller.json
index b251f43b4..1f0b9ccd4 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/JUMP_BoundsFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/JUMP_BoundsFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "0"
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/JUMP_BoundsOOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/JUMP_BoundsOOGFiller.json
index 1d9551d6d..c1e52410d 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/JUMP_BoundsOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/JUMP_BoundsOOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "0"
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/MLOAD_Bounds2Filler.json b/src/GeneralStateTestsFiller/stBoundsTest/MLOAD_Bounds2Filler.json
index 644d6d426..35b79c2ba 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/MLOAD_Bounds2Filler.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/MLOAD_Bounds2Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "0"
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/MLOAD_Bounds2OOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/MLOAD_Bounds2OOGFiller.json
index b9fa2b8fc..e1de01eee 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/MLOAD_Bounds2OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/MLOAD_Bounds2OOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "0"
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/MLOAD_Bounds3OOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/MLOAD_Bounds3OOGFiller.json
index de12e12e7..f892c6be0 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/MLOAD_Bounds3OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/MLOAD_Bounds3OOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "0"
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/MLOAD_BoundsOOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/MLOAD_BoundsOOGFiller.json
index 87faded1d..511cea0fd 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/MLOAD_BoundsOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/MLOAD_BoundsOOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "0"
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/MSTORE_Bounds2Filler.json b/src/GeneralStateTestsFiller/stBoundsTest/MSTORE_Bounds2Filler.json
index aa2d7e818..f5e9a4751 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/MSTORE_Bounds2Filler.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/MSTORE_Bounds2Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "0"
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/MSTORE_BoundsFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/MSTORE_BoundsFiller.json
index 6ffbba938..5d39f93da 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/MSTORE_BoundsFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/MSTORE_BoundsFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "0"
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/MSTORE_BoundsOOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/MSTORE_BoundsOOGFiller.json
index 7d69145ba..b6ca0efa3 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/MSTORE_BoundsOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/MSTORE_BoundsOOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "0"
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/POP_BoundsFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/POP_BoundsFiller.json
index 9386a7f80..7997cb0fb 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/POP_BoundsFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/POP_BoundsFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "1"
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/POP_BoundsOOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/POP_BoundsOOGFiller.json
index 62bb4aed8..53cc16de2 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/POP_BoundsOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/POP_BoundsOOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "1"
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/RETURN_BoundsFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/RETURN_BoundsFiller.json
index 232d15fa9..8b44a99a6 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/RETURN_BoundsFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/RETURN_BoundsFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "1",
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/RETURN_BoundsOOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/RETURN_BoundsOOGFiller.json
index ea10a501d..d38bedaed 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/RETURN_BoundsOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/RETURN_BoundsOOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "0",
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/SLOAD_BoundsFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/SLOAD_BoundsFiller.json
index d8e351de3..51cdbf866 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/SLOAD_BoundsFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/SLOAD_BoundsFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "1"
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/SLOAD_BoundsOOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/SLOAD_BoundsOOGFiller.json
index 092bb79ff..d6776e343 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/SLOAD_BoundsOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/SLOAD_BoundsOOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "1"
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/SSTORE_BoundsFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/SSTORE_BoundsFiller.json
index ea4a876be..53f7538f3 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/SSTORE_BoundsFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/SSTORE_BoundsFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "1",
diff --git a/src/GeneralStateTestsFiller/stBoundsTest/SSTORE_BoundsOOGFiller.json b/src/GeneralStateTestsFiller/stBoundsTest/SSTORE_BoundsOOGFiller.json
index 3d5c1ed95..3c51b8302 100644
--- a/src/GeneralStateTestsFiller/stBoundsTest/SSTORE_BoundsOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stBoundsTest/SSTORE_BoundsOOGFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Frontier",
+                "network" : ["ALL"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "0",
diff --git a/src/GeneralStateTestsFiller/stCallCodes/call_OOG_additionalGasCosts1Filler.json b/src/GeneralStateTestsFiller/stCallCodes/call_OOG_additionalGasCosts1Filler.json
index 5522da175..e99f4ac06 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/call_OOG_additionalGasCosts1Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/call_OOG_additionalGasCosts1Filler.json
@@ -17,10 +17,25 @@
                		    "shouldnotexist" : "1"
             		 },
            		 "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-               		    "balance" : "0x7530"
+               		    "balance" : "30000"
             		 },
             		 "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-            		    "balance" : "0x0de0b6b3a7638ad0"
+            		    "balance" : "999999999999970000"
+            		 }
+                }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
+                "network" : ["EIP158"],
+                "result" : {
+	    		"1000000000000000000000000000000000000001" : {
+               		    "shouldnotexist" : "1"
+            		 },
+           		 "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+               		    "balance" : "21727"
+            		 },
+            		 "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            		    "balance" : "999999999999978273"
             		 }
                 }
             }
diff --git a/src/GeneralStateTestsFiller/stCallCodes/call_OOG_additionalGasCosts2Filler.json b/src/GeneralStateTestsFiller/stCallCodes/call_OOG_additionalGasCosts2Filler.json
index aa803dd0c..d5d99241e 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/call_OOG_additionalGasCosts2Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/call_OOG_additionalGasCosts2Filler.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier","Homestead"],
+                "network" : ["Frontier","Homestead", "EIP158"],
                 "result" : {
 	    		"1000000000000000000000000000000000000001" : {
                		    "balance" : "0"
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcall_00Filler.json b/src/GeneralStateTestsFiller/stCallCodes/callcall_00Filler.json
index 9aae3bd23..abea5b9b3 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcall_00Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcall_00Filler.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier","Homestead"],
+                "network" : ["Frontier","Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000002" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcall_00_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcall_00_OOGEFiller.json
index d379810ca..bfc04a7c9 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcall_00_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcall_00_OOGEFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcall_00_OOGE_valueTransferFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcall_00_OOGE_valueTransferFiller.json
index 78cb92350..833c458cf 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcall_00_OOGE_valueTransferFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcall_00_OOGE_valueTransferFiller.json
@@ -32,6 +32,30 @@
                 	}
             	    }
                 }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
+                "network" : ["EIP158"],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                	"storage" : {
+			    "0x00" : "0x01",
+			    "0x01" : "0x00",
+			    "0x02" : "0x00"
+                	}
+            	     },
+            	    "1000000000000000000000000000000000000001" : {
+               		 "storage" : {
+			    "0x01" : "0x00",
+			    "0x02" : "0x00"
+            		}
+            	    },
+            	    "1000000000000000000000000000000000000002" : {
+                	"storage" : {
+			    "0x02" : "0x00"
+                	}
+            	    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcall_00_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcall_00_SuicideEndFiller.json
index 82f170383..e5ffbfa62 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcall_00_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcall_00_SuicideEndFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "1000000010000000000"
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000Filler.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000Filler.json
index 6e8e0c395..b3efc5b82 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000Filler.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000003" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_OOGEFiller.json
index c0991e201..f33abc5ef 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_OOGEFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_OOGMAfterFiller.json
index f1e8d72c2..dbca2cf5a 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_OOGMAfterFiller.json
@@ -40,6 +40,38 @@
                         }
                     }
                 }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
+                "network" : ["EIP158"],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x00",
+                            "0x02" : "0x00",
+                            "0x03" : "0x00"
+                        }
+                    },
+                    "1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x00",
+                            "0x02" : "0x00",
+                            "0x03" : "0x00"
+                        }
+                    },
+                    "1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                            "0x02" : "0x00",
+                            "0x03" : "0x00"
+                        }
+                    },
+                    "1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                            "0x03" : "0x00"
+                        }
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_OOGMBeforeFiller.json
index 521e096cc..e92ee2450 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_OOGMBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_OOGMBeforeFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_SuicideEndFiller.json
index 9f95c7acd..66ed5c013 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_SuicideEndFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000001" : {
                         "balance" : "20000000000"
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_SuicideMiddleFiller.json
index cd50c45df..c7cb82de8 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcall_000_SuicideMiddleFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "1000000010000000000",
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcall_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcall_ABCB_RECURSIVEFiller.json
index 4dafeed62..dd1deb096 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcall_ABCB_RECURSIVEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcall_ABCB_RECURSIVEFiller.json
@@ -35,6 +35,33 @@
                         "balance" : "566210"
                     }
                 }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
+                "network" : ["EIP158"],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x00"
+                        }
+                    },
+                    "1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x00"
+                        }
+                    },
+                    "1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                            "0x01" : "0x00",
+                            "0x02" : "0x00"
+                        }
+                    },
+                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "568190"
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001Filler.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001Filler.json
index 4da407fb2..498c7883c 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001Filler.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000002" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_OOGEFiller.json
index 1b33450c7..f13d017b1 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_OOGEFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_OOGMAfterFiller.json
index d6c6c9c04..367d89e74 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_OOGMAfterFiller.json
@@ -40,6 +40,38 @@
                         }
                     }
                 }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
+                "network" : ["EIP158"],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x00",
+                            "0x02" : "0x00",
+                            "0x03" : "0x00"
+                        }
+                    },
+                    "1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x00",
+                            "0x02" : "0x00",
+                            "0x03" : "0x00"
+                        }
+                    },
+                    "1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                            "0x02" : "0x00",
+                            "0x03" : "0x00"
+                        }
+                    },
+                    "1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                            "0x03" : "0x00"
+                        }
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_OOGMBeforeFiller.json
index cd6160cb7..58bbe4b49 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_OOGMBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_OOGMBeforeFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_SuicideEndFiller.json
index 2a0e958f5..c2b3662c4 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_SuicideEndFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000001" : {
                         "balance" : "20000000000"
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_SuicideMiddleFiller.json
index 15c3d70f4..53a1c8eb1 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_001_SuicideMiddleFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "1000000010000000000",
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_ABCB_RECURSIVEFiller.json
index 1a5c83221..76cd24552 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_ABCB_RECURSIVEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcallcode_ABCB_RECURSIVEFiller.json
@@ -35,6 +35,33 @@
                         "balance" : "566210"
                     }
                 }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
+                "network" : ["EIP158"],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x00"
+                        }
+                    },
+                    "1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x00"
+                        }
+                    },
+                    "1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                            "0x01" : "0x00",
+                            "0x02" : "0x00"
+                        }
+                    },
+                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "568190"
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcode_01Filler.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcode_01Filler.json
index 25583c95b..7473e59d3 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcode_01Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcode_01Filler.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000001" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcode_01_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcode_01_OOGEFiller.json
index 9d9d9dcf3..0f82abc33 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcode_01_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcode_01_OOGEFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
 	    "1000000000000000000000000000000000000000" : {
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcode_01_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcode_01_SuicideEndFiller.json
index 989edc356..a0ebfa51f 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcode_01_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcode_01_SuicideEndFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "1000000010000000000"
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010Filler.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010Filler.json
index 8d499cccc..93ed28ef4 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010Filler.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000001" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_OOGEFiller.json
index b356414fb..76b73f661 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_OOGEFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_OOGMAfterFiller.json
index 00375b424..2427c2bf3 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_OOGMAfterFiller.json
@@ -43,6 +43,41 @@
                         }
                     }
                 }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
+                "network" : ["EIP158"],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x00",
+                            "0x02" : "0x00",
+                            "0x03" : "0x00"
+                        }
+                    },
+                    "1000000000000000000000000000000000000001" : {
+                        "storage" : {
+			    "0x00" : "0x00",
+                            "0x01" : "0x00",
+                            "0x02" : "0x00",
+                            "0x03" : "0x00"
+                        }
+                    },
+                    "1000000000000000000000000000000000000002" : {
+                        "storage" : {
+			    "0x00" : "0x00",
+                            "0x01" : "0x00",
+                            "0x02" : "0x00",
+                            "0x03" : "0x00"
+                        }
+                    },
+                    "1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                            "0x03" : "0x00"
+                        }
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_OOGMBeforeFiller.json
index 81bf783fb..345ee05ce 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_OOGMBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_OOGMBeforeFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_SuicideEndFiller.json
index 9dfaa5d34..4ff1c1614 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_SuicideEndFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000002" : {
                         "balance" : "10000000000",
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_SuicideMiddleFiller.json
index e27abc2cf..10eda86a5 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_010_SuicideMiddleFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "1000000010000000000",
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_ABCB_RECURSIVEFiller.json
index 67d89f74b..519745e98 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_ABCB_RECURSIVEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecall_ABCB_RECURSIVEFiller.json
@@ -35,6 +35,33 @@
                         "balance" : "566210"
                     }
                 }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
+                "network" : ["EIP158"],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x00"
+                        }
+                    },
+                    "1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x00"
+                        }
+                    },
+                    "1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                            "0x01" : "0x00",
+                            "0x02" : "0x00"
+                        }
+                    },
+                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "568190"
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011Filler.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011Filler.json
index 664f0842a..63a51ff22 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011Filler.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000001" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_OOGEFiller.json
index 998f151b7..fc64b0ef8 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_OOGEFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_OOGMAfterFiller.json
index 9e8f1a351..8dfe9c9f7 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_OOGMAfterFiller.json
@@ -40,6 +40,38 @@
                         }
                     }
                 }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
+                "network" : ["EIP158"],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x00",
+                            "0x02" : "0x00",
+                            "0x03" : "0x00"
+                        }
+                    },
+                    "1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x00",
+                            "0x02" : "0x00",
+                            "0x03" : "0x00"
+                        }
+                    },
+                    "1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                            "0x02" : "0x00",
+                            "0x03" : "0x00"
+                        }
+                    },
+                    "1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                            "0x03" : "0x00"
+                        }
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_OOGMBeforeFiller.json
index 775dcba37..10d0a3fcc 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_OOGMBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_OOGMBeforeFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_SuicideEndFiller.json
index eb460c013..f4d43f4c4 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_SuicideEndFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000002" : {
                         "balance" : "10000000000",
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_SuicideMiddleFiller.json
index a8db02541..5e32d7cef 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_011_SuicideMiddleFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "1000000010000000000",
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_ABCB_RECURSIVEFiller.json
index 5974d85ba..116902b89 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_ABCB_RECURSIVEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcallcodecallcode_ABCB_RECURSIVEFiller.json
@@ -35,6 +35,33 @@
                         "balance" : "566210"
                     }
                 }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
+                "network" : ["EIP158"],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x00"
+                        }
+                    },
+                    "1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x00"
+                        }
+                    },
+                    "1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                            "0x01" : "0x00",
+                            "0x02" : "0x00"
+                        }
+                    },
+                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "568190"
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcode_checkPCFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcode_checkPCFiller.json
index 70da1734e..ab873a4ed 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcode_checkPCFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcode_checkPCFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier","Homestead"],
+                "network" : ["Frontier","Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                 	"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecall_10Filler.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecall_10Filler.json
index ffe1e3464..02384d5cc 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecall_10Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecall_10Filler.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecall_10_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecall_10_OOGEFiller.json
index ddb5c6700..8282b24ba 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecall_10_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecall_10_OOGEFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecall_10_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecall_10_SuicideEndFiller.json
index b39f8966c..1be2d84e1 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecall_10_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecall_10_SuicideEndFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000001" : {
                         "balance" : "10000000000",
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100Filler.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100Filler.json
index 58331e3e3..2f1d7cf89 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100Filler.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_OOGEFiller.json
index d21465847..b00881deb 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_OOGEFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_OOGMAfterFiller.json
index 8d47737aa..6dff4c80b 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_OOGMAfterFiller.json
@@ -41,6 +41,39 @@
                         }
                     }
                 }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
+                "network" : ["EIP158"],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x00"
+                        }
+                    },
+                    "1000000000000000000000000000000000000001" : {
+                        "storage" : {
+			    "0x00" : "0x00",
+                            "0x01" : "0x00",
+                            "0x02" : "0x00",
+                            "0x03" : "0x00"
+                        }
+                    },
+                    "1000000000000000000000000000000000000002" : {
+                        "storage" : {
+			    "0x00" : "0x00",
+			    "0x01" : "0x00",
+                            "0x02" : "0x00",
+                            "0x03" : "0x00"
+                        }
+                    },
+                    "1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                            "0x03" : "0x00"
+                        }
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_OOGMBeforeFiller.json
index 7b007d8a9..a71516b4b 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_OOGMBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_OOGMBeforeFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_SuicideEndFiller.json
index dbb06aefa..b17dbea49 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_SuicideEndFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "1000000000000000000",
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_SuicideMiddleFiller.json
index 235d26cd1..037e40f19 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_100_SuicideMiddleFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "1000000010000000000",
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_ABCB_RECURSIVEFiller.json
index cb2971245..ab221c55f 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_ABCB_RECURSIVEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcall_ABCB_RECURSIVEFiller.json
@@ -35,6 +35,33 @@
                         "balance" : "566210"
                     }
                 }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
+                "network" : ["EIP158"],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x00",
+                            "0x02" : "0x00"
+                        }
+                    },
+                    "1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                            "0x01" : "0x00",
+                            "0x02" : "0x00"
+                        }
+                    },
+                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "568190"
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101Filler.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101Filler.json
index bd23d19a6..c80be968f 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101Filler.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_OOGEFiller.json
index 5075ac008..4c199e86c 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_OOGEFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_OOGMAfterFiller.json
index 4d2dc162d..53927f59d 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_OOGMAfterFiller.json
@@ -43,6 +43,41 @@
                         }
                     }
                 }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
+                "network" : ["EIP158"],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x00",
+                            "0x02" : "0x00",
+                            "0x03" : "0x00"
+                        }
+                    },
+                    "1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x00" : "0x00",
+                            "0x01" : "0x00",
+                            "0x02" : "0x00",
+                            "0x03" : "0x00"
+                        }
+                    },
+                    "1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                            "0x00" : "0x00",
+                            "0x01" : "0x00",
+                            "0x02" : "0x00",
+                            "0x03" : "0x00"
+                        }
+                    },
+                    "1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                            "0x03" : "0x00"
+                        }
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_OOGMBeforeFiller.json
index b003bc26d..e7f43f848 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_OOGMBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_OOGMBeforeFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_SuicideEndFiller.json
index be0cf3f50..f4c3ef492 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_SuicideEndFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_SuicideMiddleFiller.json
index 5626de89d..07c2cb3ec 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_101_SuicideMiddleFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "balance" : "1000000010000000000",
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_ABCB_RECURSIVEFiller.json
index 3347e1591..9457db0c9 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_ABCB_RECURSIVEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcallcode_ABCB_RECURSIVEFiller.json
@@ -35,6 +35,33 @@
                         "balance" : "566210"
                     }
                 }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
+                "network" : ["EIP158"],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x00",
+                            "0x02" : "0x00"
+                        }
+                    },
+                    "1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                            "0x01" : "0x00",
+                            "0x02" : "0x00"
+                        }
+                    },
+                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "568190"
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcode_11Filler.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcode_11Filler.json
index 097311aeb..2bfd9c8fb 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcode_11Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcode_11Filler.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcode_11_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcode_11_OOGEFiller.json
index 01f3a4b2a..b4ddb89cb 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcode_11_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcode_11_OOGEFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier","Homestead"],
+                "network" : ["Frontier","Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcode_11_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcode_11_SuicideEndFiller.json
index eb1f16f57..fc8d03f79 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcode_11_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcode_11_SuicideEndFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000001" : {
                         "balance" : "10000000000",
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110Filler.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110Filler.json
index ad436fa60..bd86379c1 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110Filler.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_OOGEFiller.json
index 505337a50..c382fae0b 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_OOGEFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_OOGMAfterFiller.json
index 0b5f41f7a..3a67577d4 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_OOGMAfterFiller.json
@@ -43,6 +43,41 @@
                         }
                     }
                 }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
+                "network" : ["EIP158"],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x00",
+                            "0x02" : "0x00",
+                            "0x03" : "0x00"
+                        }
+                    },
+                    "1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x00" : "0x00",
+                            "0x01" : "0x00",
+                            "0x02" : "0x00",
+                            "0x03" : "0x00"
+                        }
+                    },
+                    "1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                            "0x00" : "0x00",
+                            "0x01" : "0x00",
+                            "0x02" : "0x00",
+                            "0x03" : "0x00"
+                        }
+                    },
+                    "1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                            "0x03" : "0x00"
+                        }
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_OOGMBeforeFiller.json
index dffe7f6a9..95085bd3f 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_OOGMBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_OOGMBeforeFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_SuicideEndFiller.json
index 11c642902..1b613055a 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_SuicideEndFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000001" : {
                         "balance" : "1000000010000000000"
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_SuicideMiddleFiller.json
index d9df935b3..332ae5c64 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_110_SuicideMiddleFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000001" : {
                         "balance" : "10000000000",
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_ABCB_RECURSIVEFiller.json
index d12350621..56e011c19 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_ABCB_RECURSIVEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecall_ABCB_RECURSIVEFiller.json
@@ -35,6 +35,33 @@
                         "balance" : "566210"
                     }
                 }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
+                "network" : ["EIP158"],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x00",
+                            "0x02" : "0x00"
+                        }
+                    },
+                    "1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                            "0x01" : "0x00",
+                            "0x02" : "0x00"
+                        }
+                    },
+                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "568190"
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111Filler.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111Filler.json
index c4241fbcd..3bb032196 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111Filler.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_OOGEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_OOGEFiller.json
index 654ba7fab..3119bd668 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_OOGEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_OOGEFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_OOGMAfterFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_OOGMAfterFiller.json
index 892b7bb42..24560cb4f 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_OOGMAfterFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_OOGMAfterFiller.json
@@ -43,6 +43,41 @@
                         }
                     }
                 }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
+                "network" : ["EIP158"],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x00",
+                            "0x02" : "0x00",
+                            "0x03" : "0x00"
+                        }
+                    },
+                    "1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x00" : "0x00",
+                            "0x01" : "0x00",
+                            "0x02" : "0x00",
+                            "0x03" : "0x00"
+                        }
+                    },
+                    "1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                            "0x00" : "0x00",
+                            "0x01" : "0x00",
+                            "0x02" : "0x00",
+                            "0x03" : "0x00"
+                        }
+                    },
+                    "1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                            "0x03" : "0x00"
+                        }
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_OOGMBeforeFiller.json
index c858e9a33..3d44c09d9 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_OOGMBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_OOGMBeforeFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_SuicideEndFiller.json
index eb2312406..3f9b048a2 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_SuicideEndFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000001" : {
                         "balance" : "1000000010000000000"
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_SuicideMiddleFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_SuicideMiddleFiller.json
index 124d501e0..5cf9c1334 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_SuicideMiddleFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_111_SuicideMiddleFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
                     "1000000000000000000000000000000000000001" : {
                         "balance" : "10000000000",
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json
index 6ffc41148..b49adb908 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodecallcodecallcode_ABCB_RECURSIVEFiller.json
@@ -35,6 +35,33 @@
                         "balance" : "566210"
                     }
                 }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
+                "network" : ["EIP158"],
+                "result" : {
+                    "1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x00",
+                            "0x02" : "0x00"
+                        }
+                    },
+                    "1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                            "0x01" : "0x00",
+                            "0x02" : "0x00"
+                        }
+                    },
+                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "568190"
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Call1024BalanceTooLowFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Call1024BalanceTooLowFiller.json
index 30da69ae4..f371935af 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Call1024BalanceTooLowFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Call1024BalanceTooLowFiller.json
@@ -19,6 +19,18 @@
                         }
                     }
                 }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
+                "network" : ["EIP158"],
+                "result" : {
+                    "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x401",
+			    "0x01" : "0x01"
+                        }
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Call1024OOGFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Call1024OOGFiller.json
index d2ea9f562..a1bce3a18 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Call1024OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Call1024OOGFiller.json
@@ -21,6 +21,19 @@
                         }
                     }
                 }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
+                "network" : ["EIP158"],
+                "result" : {
+                    "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x85",
+                            "0x01" : "0x01",
+                            "0x02" : "0x20789"
+                        }
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Call1024PreCallsFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Call1024PreCallsFiller.json
index f4e728e8a..f6775c85c 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Call1024PreCallsFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Call1024PreCallsFiller.json
@@ -15,7 +15,21 @@
                 "result" : {
                     "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "storage" : {
-                            "0x" : "0x01",
+                            "0x00" : "0x01",
+                            "0x02" : "0x01",
+                            "0x03" : "0x01"
+                        }
+                    }
+                }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
+                "network" : ["EIP158"],
+                "result" : {
+                    "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x03e4",
+			    "0x01" : "0x01",
                             "0x02" : "0x01",
                             "0x03" : "0x01"
                         }
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/CallLoseGasOOGFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/CallLoseGasOOGFiller.json
index 855ebc838..132931a09 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/CallLoseGasOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/CallLoseGasOOGFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier","Homestead"],
+                "network" : ["Frontier","Homestead", "EIP158"],
                 "result" : {
                     "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/CallRecursiveBombPreCallFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/CallRecursiveBombPreCallFiller.json
index 15a94cd57..dd452d0e3 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/CallRecursiveBombPreCallFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/CallRecursiveBombPreCallFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier","Homestead"],
+                "network" : ["Frontier","Homestead", "EIP158"],
                 "result" : {
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Callcode1024BalanceTooLowFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Callcode1024BalanceTooLowFiller.json
index 58f917e95..a170d05d2 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Callcode1024BalanceTooLowFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Callcode1024BalanceTooLowFiller.json
@@ -19,6 +19,18 @@
                         }
                     }
                 }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
+                "network" : ["EIP158"],
+                "result" : {
+                    "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x401",
+			    "0x01" : "0x01"
+                        }
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Callcode1024OOGFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Callcode1024OOGFiller.json
index 5c8332af5..0104a09c7 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Callcode1024OOGFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/Callcode1024OOGFiller.json
@@ -15,12 +15,25 @@
                 "result" : {
                     "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "storage" : {
-                            "0x" : "0x0401",
+                            "0x00" : "0x0401",
                             "0x01" : "0x01",
                             "0x02" : "0x0fa3e9"
                         }
                     }
                 }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
+                "network" : ["EIP158"],
+                "result" : {
+                    "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x0401",
+                            "0x01" : "0x01",
+                            "0x02" : "0x20789"
+                        }
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/CallcodeLoseGasOOGFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/CallcodeLoseGasOOGFiller.json
index 7a9047146..5dd941ba4 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/CallcodeLoseGasOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/CallcodeLoseGasOOGFiller.json
@@ -20,6 +20,18 @@
                         }
                     }
                 }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
+                "network" : ["EIP158"],
+                "result" : {
+                    "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x02" : "0x00"
+                        }
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput1Filler.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput1Filler.json
index 34df1baa8..4e350d08d 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput1Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput1Filler.json
@@ -11,7 +11,7 @@
 	"expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
 			"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 	    "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput2Filler.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput2Filler.json
index 3567ea643..568bea22b 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput2Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput2Filler.json
@@ -11,7 +11,7 @@
 	"expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
 			"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 	    "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput3FailFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput3FailFiller.json
index 4f2974e88..aabc5da34 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput3FailFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput3FailFiller.json
@@ -11,7 +11,7 @@
 	"expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
 			"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 	    "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput3Filler.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput3Filler.json
index 7ffaf2c74..016b3ac7c 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput3Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput3Filler.json
@@ -11,7 +11,7 @@
 	"expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
 			"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 	    "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput3partialFailFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput3partialFailFiller.json
index 62f0b9bf2..5bc38e49c 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput3partialFailFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput3partialFailFiller.json
@@ -11,7 +11,7 @@
 	"expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
 			"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 	    "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput3partialFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput3partialFiller.json
index 33831deb9..4243f8f2b 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput3partialFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callOutput3partialFiller.json
@@ -11,7 +11,7 @@
 	"expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
 			"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 	    "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueAndGasOOGFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueAndGasOOGFiller.json
index cbcf004a7..1bb91ee26 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueAndGasOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueAndGasOOGFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier","Homestead"],
+                "network" : ["Frontier","Homestead", "EIP158"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevelFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevelFiller.json
index a80ea0c6d..de018d865 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevelFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueAndOOGatTxLevelFiller.json
@@ -21,6 +21,19 @@
                         "balance" : "3000000"
                     }
                 }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
+                "network" : ["EIP158"],
+                "result" : {
+                    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    },
+                    "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "33424"
+                    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueFiller.json
index e0dbb7144..54952d4b1 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier","Homestead"],
+                "network" : ["Frontier","Homestead", "EIP158"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueOOGinCallFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueOOGinCallFiller.json
index 0a8253a74..598236f22 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueOOGinCallFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callWithHighValueOOGinCallFiller.json
@@ -25,6 +25,23 @@
 			    "balance" : "0x0de0b6b3a763155a"
 	    		}
                 }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
+                "network" : ["EIP158"],
+                "result" : {
+	    		"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+			    "storage" : {
+		    		"0x00" : "0x01"
+			    }
+	    		}, 
+	    		"945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+			    "balance" : "0x17"
+	    		},
+	    		"a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+			    "balance" : "999999999999939270"
+	    		}
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput1Filler.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput1Filler.json
index 6ab10320f..12ec5f37a 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput1Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput1Filler.json
@@ -11,7 +11,7 @@
 	"expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
 			"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 	    "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput2Filler.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput2Filler.json
index dc7233e49..f338e5241 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput2Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput2Filler.json
@@ -11,7 +11,7 @@
 	"expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
 			"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 	    "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput3FailFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput3FailFiller.json
index 74c9f0e2b..77cca67f6 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput3FailFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput3FailFiller.json
@@ -11,7 +11,7 @@
 	"expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
 			"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 	    "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput3Filler.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput3Filler.json
index 01d850d74..2a6dfedf1 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput3Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput3Filler.json
@@ -11,7 +11,7 @@
 	"expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
 			"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 	    "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput3partialFailFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput3partialFailFiller.json
index e59c61fdb..ee721a40a 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput3partialFailFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput3partialFailFiller.json
@@ -11,7 +11,7 @@
 	"expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
 			"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 	    "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput3partialFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput3partialFiller.json
index 99f58aedb..c70b4172c 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput3partialFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeOutput3partialFiller.json
@@ -11,7 +11,7 @@
 	"expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
 			"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 	    "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOGFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOGFiller.json
index dabe6b760..5fd5c228d 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeWithHighValueAndGasOOGFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier","Homestead"],
+                "network" : ["Frontier","Homestead", "EIP158"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeWithHighValueFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeWithHighValueFiller.json
index 2d9e3bca0..234aabd23 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeWithHighValueFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/callcodeWithHighValueFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier","Homestead"],
+                "network" : ["Frontier","Homestead", "EIP158"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createFailBalanceTooLowFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createFailBalanceTooLowFiller.json
index 6c5de4f25..38cbba6a9 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createFailBalanceTooLowFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createFailBalanceTooLowFiller.json
@@ -11,7 +11,7 @@
 	"expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
 			"0000000000000000000000000000000000000000" : {
                 	    "balance" : "0x0de0b6b3a7640017"
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailBadJumpDestinationFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailBadJumpDestinationFiller.json
index b8e481831..349637130 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailBadJumpDestinationFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailBadJumpDestinationFiller.json
@@ -11,7 +11,7 @@
 	"expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
 			"0000000000000000000000000000000000000000" : {
                 	    "balance" : "0x0de0b6b3a76586a0"
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024Filler.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024Filler.json
index 472f36352..0d5efe66d 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024Filler.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailStackSizeLargerThan1024Filler.json
@@ -11,7 +11,7 @@
 	"expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
 			"0000000000000000000000000000000000000000" : {
                 	    "balance" : "0x0de0b6b3a76586a0"
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailStackUnderflowFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailStackUnderflowFiller.json
index 824760399..1ab72d7fd 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailStackUnderflowFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailStackUnderflowFiller.json
@@ -11,7 +11,7 @@
 	"expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
 			"0000000000000000000000000000000000000000" : {
                 	    "balance" : "0x0de0b6b3a76586a0"
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailUndefinedInstructionFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailUndefinedInstructionFiller.json
index 669b1153a..6d6b75bdd 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailUndefinedInstructionFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFailUndefinedInstructionFiller.json
@@ -11,7 +11,7 @@
 	"expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
 			"0000000000000000000000000000000000000000" : {
                 	    "balance" : "0x0de0b6b3a76586a0"
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFail_OOGduringInitFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFail_OOGduringInitFiller.json
index 7b4758069..fc796035e 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFail_OOGduringInitFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitFail_OOGduringInitFiller.json
@@ -17,6 +17,15 @@
                 	    "balance" : "0x0de0b6b3a76586a0"
             		}
             	}
+	    },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
+                "network" : ["EIP158"],
+                "result" : {
+			"0000000000000000000000000000000000000000" : {
+                	    "shouldnotexist" : "1"
+            		}
+            	}
 	    }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitOOGforCREATEFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitOOGforCREATEFiller.json
index c3bed40d8..53211ed94 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitOOGforCREATEFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createInitOOGforCREATEFiller.json
@@ -11,7 +11,7 @@
 	"expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
 			"095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 	    "nonce" : "0"
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createJS_ExampleContractFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createJS_ExampleContractFiller.json
index 830412ada..f6b0993c6 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createJS_ExampleContractFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createJS_ExampleContractFiller.json
@@ -11,7 +11,7 @@
 	"expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier", "Homestead"],
+                "network" : ["Frontier", "Homestead", "EIP158"],
                 "result" : {
             	    "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                 	"storage" : {
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPerTxsFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPerTxsFiller.json
index 6fc4c7432..0f3a26bd8 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPerTxsFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPerTxsFiller.json
@@ -22,6 +22,20 @@
                 	}
 	    	    }
                 }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
+                "network" : ["EIP158"],
+                "result" : {
+	    	    "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                	"balance" : "0x0186a0",
+                	"code" : "0x396000f3006000355415600957005b60",
+                	"nonce" : "0x01",
+                	"storage" : {
+                    	    "0x01" : "0x01"
+                	}
+	    	    }
+                }
             }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGasFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGasFiller.json
index 0392c6ccf..38eeae421 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGasFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPerTxsNotEnoughGasFiller.json
@@ -21,7 +21,7 @@
             },
 	    {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Homestead"],
+                "network" : ["Homestead", "EIP158"],
                 "result" : {
 	    	    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 	"balance" : "0x0de0b6b3a7640000",
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGasFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGasFiller.json
index 3443ff07c..010604267 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGasFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorPreStore1NotEnoughGasFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier","Homestead"],
+                "network" : ["Frontier","Homestead", "EIP158"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "0x01"
diff --git a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHighFiller.json b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHighFiller.json
index 0a30a9b3d..7fb91b76d 100644
--- a/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHighFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCreateCallCodeTest/createNameRegistratorendowmentTooHighFiller.json
@@ -11,7 +11,7 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["Frontier","Homestead"],
+                "network" : ["Frontier","Homestead", "EIP158"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {