diff --git a/tests/files/VMTests/RandomTests/201501121323MULMOD_GO.json b/tests/files/VMTests/RandomTests/201501121323MULMOD_GO.json
deleted file mode 100644
index 1daf701e0..000000000
--- a/tests/files/VMTests/RandomTests/201501121323MULMOD_GO.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-    "randomVMtest" : {
-        "callcreates" : [
-        ],
-        "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
-            "currentGasLimit" : "1000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : "2",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "code" : "0x414341424443850659a055450955",
-            "data" : "0x",
-            "gas" : "10000",
-            "gasPrice" : "100000000000000",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000"
-        },
-        "gas" : "0",
-        "logs" : [
-            {
-                "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-                "bloom" : "00000000000000000000800000000000000000000000000000000880000000000000000000000000000000000000000000000000000000000000000000000000",
-                "data" : "0x",
-                "topics" : [
-                ]
-            }
-        ],
-        "out" : "0x",
-        "post" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "code" : "0x414341424443850659a055450955",
-                "nonce" : "0",
-                "storage" : {
-                    "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" : "0x02"
-                }
-            }
-        },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "code" : "0x414341424443850659a055450955",
-                "nonce" : "0",
-                "storage" : {
-                }
-            }
-        }
-    }
-}
diff --git a/tests/files/VMTests/RandomTests/201501121402CALL_GO.json b/tests/files/VMTests/RandomTests/201501122225CALL_TO_PRECOMPILED_GO.json
similarity index 83%
rename from tests/files/VMTests/RandomTests/201501121402CALL_GO.json
rename to tests/files/VMTests/RandomTests/201501122225CALL_TO_PRECOMPILED_GO.json
index 6a847d261..d5ee2bbf3 100644
--- a/tests/files/VMTests/RandomTests/201501121402CALL_GO.json
+++ b/tests/files/VMTests/RandomTests/201501122225CALL_TO_PRECOMPILED_GO.json
@@ -5,7 +5,7 @@
                 "data" : "0x0000",
                 "destination" : "0000000000000000000000000000000000000002",
                 "gasLimit" : "0",
-                "value" : "0"
+                "value" : "1000000"
             }
         ],
         "env" : {
@@ -19,31 +19,31 @@
         "exec" : {
             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "code" : "0x4243434242434243f14555",
+            "code" : "0x424345424245424335f15155",
             "data" : "0x",
             "gas" : "10000",
             "gasPrice" : "100000000000000",
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "9670",
+        "gas" : "9668",
         "logs" : [
         ],
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "code" : "0x4243434242434243f14555",
+                "balance" : "999999999999000000",
+                "code" : "0x424345424245424335f15155",
                 "nonce" : "0",
                 "storage" : {
-                    "0x0f4240" : "0x01"
+                    "0x" : "0x02"
                 }
             }
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x4243434242434243f14555",
+                "code" : "0x424345424245424335f15155",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/tests/files/VMTests/RandomTests/201501121416ADDMOD_GO.json b/tests/files/VMTests/RandomTests/201501122239BALANCE_OF_ADDRESS_GO.json
similarity index 85%
rename from tests/files/VMTests/RandomTests/201501121416ADDMOD_GO.json
rename to tests/files/VMTests/RandomTests/201501122239BALANCE_OF_ADDRESS_GO.json
index 8f11540d2..1741d4a0f 100644
--- a/tests/files/VMTests/RandomTests/201501121416ADDMOD_GO.json
+++ b/tests/files/VMTests/RandomTests/201501122239BALANCE_OF_ADDRESS_GO.json
@@ -13,31 +13,31 @@
         "exec" : {
             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "code" : "0x4341434543454542559313088e55",
+            "code" : "0x434244424342303155",
             "data" : "0x",
             "gas" : "10000",
             "gasPrice" : "100000000000000",
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "0",
+        "gas" : "9673",
         "logs" : [
         ],
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x4341434543454542559313088e55",
+                "code" : "0x434244424342303155",
                 "nonce" : "0",
                 "storage" : {
-                    "0x02" : "0x0f4240"
+                    "0x0de0b6b3a7640000" : "0x02"
                 }
             }
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x4341434543454542559313088e55",
+                "code" : "0x434244424342303155",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/tests/files/VMTests/RandomTests/201501121408ADDMOD_GO.json b/tests/files/VMTests/RandomTests/201501130902PYTHON_BLOCKHASH.json
similarity index 72%
rename from tests/files/VMTests/RandomTests/201501121408ADDMOD_GO.json
rename to tests/files/VMTests/RandomTests/201501130902PYTHON_BLOCKHASH.json
index 026a513af..2303227af 100644
--- a/tests/files/VMTests/RandomTests/201501121408ADDMOD_GO.json
+++ b/tests/files/VMTests/RandomTests/201501130902PYTHON_BLOCKHASH.json
@@ -1,6 +1,12 @@
 {
     "randomVMtest" : {
         "callcreates" : [
+            {
+                "data" : "0x0000",
+                "destination" : "",
+                "gasLimit" : "9890",
+                "value" : "1000000"
+            }
         ],
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
@@ -13,31 +19,31 @@
         "exec" : {
             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "code" : "0x4241455544414443385908069c9e8955",
+            "code" : "0x454243404244404045f060048160a255",
             "data" : "0x",
             "gas" : "10000",
             "gasPrice" : "100000000000000",
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "0",
+        "gas" : "9587",
         "logs" : [
         ],
         "out" : "0x",
         "post" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "code" : "0x4241455544414443385908069c9e8955",
+                "balance" : "999999999999000000",
+                "code" : "0x454243404244404045f060048160a255",
                 "nonce" : "0",
                 "storage" : {
-                    "0x0f4240" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+                    "0xa2" : "0x945304eb96065b2a98b57a48a06ae28d285a71b5"
                 }
             }
         },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x4241455544414443385908069c9e8955",
+                "code" : "0x454243404244404045f060048160a255",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/tests/files/VMTests/RandomTests/201501121328MULMOD_GO.json b/tests/files/VMTests/RandomTests/201501130903PYTHON_INVALID_JUMP_DESTINATION.json
similarity index 65%
rename from tests/files/VMTests/RandomTests/201501121328MULMOD_GO.json
rename to tests/files/VMTests/RandomTests/201501130903PYTHON_INVALID_JUMP_DESTINATION.json
index fd03ec48f..a5f37de74 100644
--- a/tests/files/VMTests/RandomTests/201501121328MULMOD_GO.json
+++ b/tests/files/VMTests/RandomTests/201501130903PYTHON_INVALID_JUMP_DESTINATION.json
@@ -1,7 +1,5 @@
 {
     "randomVMtest" : {
-        "callcreates" : [
-        ],
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
@@ -13,31 +11,17 @@
         "exec" : {
             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "code" : "0x424341434541904255151409a29a9c55",
+            "code" : "0x42414444404343342061036e57a4084155",
             "data" : "0x",
             "gas" : "10000",
             "gasPrice" : "100000000000000",
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "0",
-        "logs" : [
-        ],
-        "out" : "0x",
-        "post" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "code" : "0x424341434541904255151409a29a9c55",
-                "nonce" : "0",
-                "storage" : {
-                    "0x02" : "0x0f4240"
-                }
-            }
-        },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x424341434541904255151409a29a9c55",
+                "code" : "0x42414444404343342061036e57a4084155",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/tests/files/VMTests/RandomTests/201501121329MULMODGO.json b/tests/files/VMTests/RandomTests/201501130906PYTHON_INVALID_OPCODE.json
similarity index 61%
rename from tests/files/VMTests/RandomTests/201501121329MULMODGO.json
rename to tests/files/VMTests/RandomTests/201501130906PYTHON_INVALID_OPCODE.json
index 755fb5925..004f2401a 100644
--- a/tests/files/VMTests/RandomTests/201501121329MULMODGO.json
+++ b/tests/files/VMTests/RandomTests/201501130906PYTHON_INVALID_OPCODE.json
@@ -1,7 +1,5 @@
 {
     "randomVMtest" : {
-        "callcreates" : [
-        ],
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
@@ -13,31 +11,17 @@
         "exec" : {
             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "code" : "0x444443424444554380330955",
+            "code" : "0x434545430c737040877855",
             "data" : "0x",
             "gas" : "10000",
             "gasPrice" : "100000000000000",
             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
             "value" : "1000000000000000000"
         },
-        "gas" : "0",
-        "logs" : [
-        ],
-        "out" : "0x",
-        "post" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "code" : "0x444443424444554380330955",
-                "nonce" : "0",
-                "storage" : {
-                    "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
-                }
-            }
-        },
         "pre" : {
             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                 "balance" : "1000000000000000000",
-                "code" : "0x444443424444554380330955",
+                "code" : "0x434545430c737040877855",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/tests/files/VMTests/vmArithmeticTest.json b/tests/files/VMTests/vmArithmeticTest.json
index 37c6bc33b..528496da4 100644
--- a/tests/files/VMTests/vmArithmeticTest.json
+++ b/tests/files/VMTests/vmArithmeticTest.json
@@ -534,6 +534,94 @@
             }
         }
     },
+    "addmodDivByZero" : {
+        "callcreates" : [
+        ],
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "256",
+            "currentGasLimit" : "1000000",
+            "currentNumber" : "0",
+            "currentTimestamp" : "1",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "code" : "0x60006001600408600055",
+            "data" : "0x",
+            "gas" : "10000",
+            "gasPrice" : "100000000000000",
+            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000"
+        },
+        "gas" : "9895",
+        "logs" : [
+        ],
+        "out" : "0x",
+        "post" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x60006001600408600055",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x60006001600408600055",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "addmodDivByZero1" : {
+        "callcreates" : [
+        ],
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "256",
+            "currentGasLimit" : "1000000",
+            "currentNumber" : "0",
+            "currentTimestamp" : "1",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "code" : "0x60006000600108600055",
+            "data" : "0x",
+            "gas" : "10000",
+            "gasPrice" : "100000000000000",
+            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000"
+        },
+        "gas" : "9895",
+        "logs" : [
+        ],
+        "out" : "0x",
+        "post" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x60006000600108600055",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x60006000600108600055",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        }
+    },
     "divByNonZero0" : {
         "callcreates" : [
         ],
@@ -5589,6 +5677,138 @@
             }
         }
     },
+    "mulmoddivByZero" : {
+        "callcreates" : [
+        ],
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "256",
+            "currentGasLimit" : "1000000",
+            "currentNumber" : "0",
+            "currentTimestamp" : "1",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "code" : "0x60006001600509600055",
+            "data" : "0x",
+            "gas" : "10000",
+            "gasPrice" : "100000000000000",
+            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000"
+        },
+        "gas" : "9895",
+        "logs" : [
+        ],
+        "out" : "0x",
+        "post" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x60006001600509600055",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x60006001600509600055",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mulmoddivByZero1" : {
+        "callcreates" : [
+        ],
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "256",
+            "currentGasLimit" : "1000000",
+            "currentNumber" : "0",
+            "currentTimestamp" : "1",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "code" : "0x60006001600009600055",
+            "data" : "0x",
+            "gas" : "10000",
+            "gasPrice" : "100000000000000",
+            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000"
+        },
+        "gas" : "9895",
+        "logs" : [
+        ],
+        "out" : "0x",
+        "post" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x60006001600009600055",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x60006001600009600055",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "mulmoddivByZero2" : {
+        "callcreates" : [
+        ],
+        "env" : {
+            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "256",
+            "currentGasLimit" : "1000000",
+            "currentNumber" : "0",
+            "currentTimestamp" : "1",
+            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec" : {
+            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "code" : "0x60006000600109600055",
+            "data" : "0x",
+            "gas" : "10000",
+            "gasPrice" : "100000000000000",
+            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value" : "1000000000000000000"
+        },
+        "gas" : "9895",
+        "logs" : [
+        ],
+        "out" : "0x",
+        "post" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x60006000600109600055",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "1000000000000000000",
+                "code" : "0x60006000600109600055",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        }
+    },
     "sdiv0" : {
         "callcreates" : [
         ],