diff --git a/test/vmIOandFlowOperationsTestFiller.json b/test/vmIOandFlowOperationsTestFiller.json
index 79d162c8d..a470b9c8d 100644
--- a/test/vmIOandFlowOperationsTestFiller.json
+++ b/test/vmIOandFlowOperationsTestFiller.json
@@ -670,6 +670,34 @@
         }
     },
 
+    "jumpi2": {
+        "env" : {
+        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+        "currentNumber" : "0",
+        "currentGasLimit" : "1000000",
+        "currentDifficulty" : "256",
+        "currentTimestamp" : 1,
+        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+            "balance" : "1000000000000000000",
+            "nonce" : 0,
+            "code" : "0x60017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff596002600357",
+            "storage": {}
+        }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
     "pc0": {
         "env" : {
         "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
diff --git a/test/vmPushDupSwapTestFiller.json b/test/vmPushDupSwapTestFiller.json
index 1bb3e6630..52c704d42 100644
--- a/test/vmPushDupSwapTestFiller.json
+++ b/test/vmPushDupSwapTestFiller.json
@@ -27,6 +27,34 @@
         }
     },
 
+    "push1_missingStack": {
+        "env" : {
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+            "currentNumber" : "0",
+            "currentGasLimit" : "1000000",
+            "currentDifficulty" : "256",
+            "currentTimestamp" : 1,
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "nonce" : 0,
+                "code" : "0x60",
+                "storage": {}
+            }
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000",
+            "data" : "",
+            "gasPrice" : "100000000000000",
+            "gas" : "10000"
+        }
+    },
+
     "push2": {
         "env" : {
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
diff --git a/test/vmSystemOperationsTestFiller.json b/test/vmSystemOperationsTestFiller.json
index c948f0436..1df2697e0 100644
--- a/test/vmSystemOperationsTestFiller.json
+++ b/test/vmSystemOperationsTestFiller.json
@@ -509,7 +509,7 @@
         }
     },
 
-    "CallRecursiveBomb": {
+    "CallRecursiveBomb0": {
          "env" : {
              "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
              "currentNumber" : "0",
@@ -543,6 +543,90 @@
          }
      },
 
+    "CallRecursiveBomb1": {
+         "env" : {
+             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+             "currentNumber" : "0",
+             "currentGasLimit" : "10000000",
+             "currentDifficulty" : "256",
+             "currentTimestamp" : 1,
+             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+         },
+         "pre" : {
+             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                 "balance" : "20000000",
+                 "nonce" : 0,
+                 "code" : "{  [[ 0 ]] (+ (SLOAD 0) 1) [[ 1 ]] (CALL (- (GAS) 224) (ADDRESS) 0 0 0 0 0)  }",
+                 "storage": {}
+             }
+         },
+         "exec" : {
+             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+             "value" : "100000",
+             "data" : "",
+             "gasPrice" : "1",
+             "gas" : "364723"
+         }
+     },
+
+    "CallRecursiveBomb2": {
+         "env" : {
+             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+             "currentNumber" : "0",
+             "currentGasLimit" : "10000000",
+             "currentDifficulty" : "256",
+             "currentTimestamp" : 1,
+             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+         },
+         "pre" : {
+             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                 "balance" : "20000000",
+                 "nonce" : 0,
+                 "code" : "{  [[ 0 ]] (+ (SLOAD 0) 1) [[ 1 ]] (CALL (- (GAS) 224) (ADDRESS) 0 0 0 0 0)  }",
+                 "storage": {}
+             }
+         },
+         "exec" : {
+             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+             "value" : "100000",
+             "data" : "",
+             "gasPrice" : "1",
+             "gas" : "364724"
+         }
+     },
+
+    "CallRecursiveBomb3": {
+         "env" : {
+             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+             "currentNumber" : "0",
+             "currentGasLimit" : "10000000",
+             "currentDifficulty" : "256",
+             "currentTimestamp" : 1,
+             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+         },
+         "pre" : {
+             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                 "balance" : "20000000",
+                 "nonce" : 0,
+                 "code" : "{  [[ 0 ]] (+ (SLOAD 0) 1) [[ 1 ]] (CALL (- (GAS) 224) (ADDRESS) 0 0 0 0 0)  }",
+                 "storage": {}
+             }
+         },
+         "exec" : {
+             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+             "value" : "100000",
+             "data" : "",
+             "gasPrice" : "1",
+             "gas" : "1000000"
+         }
+     },
+
     "suicide0": {
         "env" : {
             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
@@ -949,6 +1033,77 @@
          }
      },
 
+    "ABAcalls2": {
+         "env" : {
+             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+             "currentNumber" : "0",
+             "currentGasLimit" : "10000000",
+             "currentDifficulty" : "256",
+             "currentTimestamp" : 1,
+             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+         },
+         "pre" : {
+             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                 "balance" : "1000000000000000000",
+                 "nonce" : 0,
+                 "code" : "{  [[ 0 ]] (ADD (SLOAD 0) 1) (CALL (- (GAS) 1000) 0x945304eb96065b2a98b57a48a06ae28d285a71b5 1 0 0 0 0) }",
+                 "storage": {}
+             },
+             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                 "balance" : "0",
+                 "code" : " { [[ 0 ]] (ADD (SLOAD 0) 1) (CALL (- (GAS) 1000) 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6 0 0 0 0 0) } ",
+                 "nonce" : "0",
+                 "storage" : {
+                 }
+             }
+
+         },
+         "exec" : {
+             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+             "value" : "100000",
+             "data" : "",
+             "gasPrice" : "100000000000000",
+             "gas" : "10000000000000"
+         }
+     },
+
+    "ABAcalls3": {
+         "env" : {
+             "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
+             "currentNumber" : "0",
+             "currentGasLimit" : "10000000",
+             "currentDifficulty" : "256",
+             "currentTimestamp" : 1,
+             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+         },
+         "pre" : {
+             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                 "balance" : "1025000",
+                 "nonce" : 0,
+                 "code" : "{  [[ 0 ]] (ADD (SLOAD 0) 1) (CALL (- (GAS) 1000) 0x945304eb96065b2a98b57a48a06ae28d285a71b5 1 0 0 0 0) }",
+                 "storage": {}
+             },
+             "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
+                 "balance" : "0",
+                 "code" : " { [[ 0 ]] (ADD (SLOAD 0) 1) (CALL (- (GAS) 1000) 0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6 0 0 0 0 0) } ",
+                 "nonce" : "0",
+                 "storage" : {
+                 }
+             }
+
+         },
+         "exec" : {
+             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
+             "value" : "100000",
+             "data" : "",
+             "gasPrice" : "100000000000000",
+             "gas" : "1000000"
+         }
+     },
 
     "ABAcallsSuicide0": {
         "env" : {