src/VMTestsFiller: formatting changes

144 files changed, 3713 insertions, 3723 deletions

diff --git a/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJump0_AfterJumpdest3Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJump0_AfterJumpdest3Filler.json
index 90dddba6e..0cddfb575 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJump0_AfterJumpdest3Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJump0_AfterJumpdest3Filler.json
@@ -1,29 +1,29 @@
 {
     "BlockNumberDynamicJump0_AfterJumpdest3": {
-       "env" : {
-       "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-       "currentNumber" : "2",
-       "currentGasLimit" : "1000000",
-       "currentDifficulty" : "256",
-       "currentTimestamp" : "1",
-       "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-       },
-       "pre" : {
-       "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "100000000000000000000000",
-           "nonce" : "0",
-           "code" : "0x6023600b60085043015660015b600255",
-           "storage": {}
-       }
-       },
-       "exec" : {
-           "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-           "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "value" : "1000000000000000000",
-           "data" : "",
-           "gasPrice" : "100000000000000",
-           "gas" : "100000"
-       }
-   }
-}
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "2",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6023600b60085043015660015b600255",
+                "nonce": "0",
+                "storage": {}
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJump0_AfterJumpdestFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJump0_AfterJumpdestFiller.json
index 06842991b..3c81646c6 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJump0_AfterJumpdestFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJump0_AfterJumpdestFiller.json
@@ -1,29 +1,29 @@
 {
     "BlockNumberDynamicJump0_AfterJumpdest": {
-       "env" : {
-       "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-       "currentNumber" : "2",
-       "currentGasLimit" : "1000000",
-       "currentDifficulty" : "256",
-       "currentTimestamp" : "1",
-       "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-       },
-       "pre" : {
-       "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "100000000000000000000000",
-           "nonce" : "0",
-           "code" : "0x6023600843015660015b600255",
-           "storage": {}
-       }
-       },
-       "exec" : {
-           "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-           "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "value" : "1000000000000000000",
-           "data" : "",
-           "gasPrice" : "100000000000000",
-           "gas" : "100000"
-       }
-   }
-}
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "2",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6023600843015660015b600255",
+                "nonce": "0",
+                "storage": {}
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJump0_foreverOutOfGasFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJump0_foreverOutOfGasFiller.json
index a82ca8a19..80c57b7f9 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJump0_foreverOutOfGasFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJump0_foreverOutOfGasFiller.json
@@ -1,29 +1,29 @@
 {
     "BlockNumberDynamicJump0_foreverOutOfGas": {
-       "env" : {
-       "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-       "currentNumber" : "2",
-       "currentGasLimit" : "1000000",
-       "currentDifficulty" : "256",
-       "currentTimestamp" : "1",
-       "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-       },
-       "pre" : {
-       "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "100000000000000000000000",
-           "nonce" : "0",
-           "code" : "0x5b600060000156",
-           "storage": {}
-       }
-       },
-       "exec" : {
-           "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-           "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "value" : "1000000000000000000",
-           "data" : "",
-           "gasPrice" : "100000000000000",
-           "gas" : "100000"
-       }
-   }
-}
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "2",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x5b600060000156",
+                "nonce": "0",
+                "storage": {}
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJump0_jumpdest0Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJump0_jumpdest0Filler.json
index 37afa7ff4..e2140f059 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJump0_jumpdest0Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJump0_jumpdest0Filler.json
@@ -1,36 +1,36 @@
 {
     "BlockNumberDynamicJump0_jumpdest0": {
-       "env" : {
-       "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-       "currentNumber" : "2",
-       "currentGasLimit" : "1000000",
-       "currentDifficulty" : "256",
-       "currentTimestamp" : "1",
-       "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-       },
-       "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x02" : "0x23"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "2",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x02": "0x23"
                 }
             }
         },
-       "pre" : {
-       "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "100000000000000000000000",
-           "nonce" : "0",
-           "code" : "0x6023600743015660015b600255",
-           "storage": {}
-       }
-       },
-       "exec" : {
-           "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-           "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "value" : "1000000000000000000",
-           "data" : "",
-           "gasPrice" : "100000000000000",
-           "gas" : "100000"
-       }
-   }
-}
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6023600743015660015b600255",
+                "nonce": "0",
+                "storage": {}
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJump0_jumpdest2Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJump0_jumpdest2Filler.json
index 34880f3d2..f43466be3 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJump0_jumpdest2Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJump0_jumpdest2Filler.json
@@ -1,36 +1,36 @@
 {
     "BlockNumberDynamicJump0_jumpdest2": {
-       "env" : {
-       "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-       "currentNumber" : "2",
-       "currentGasLimit" : "1000000",
-       "currentDifficulty" : "256",
-       "currentTimestamp" : "1",
-       "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-       },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x02" : "0x23"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "2",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x02": "0x23"
                 }
             }
         },
-       "pre" : {
-       "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "100000000000000000000000",
-           "nonce" : "0",
-           "code" : "0x6023600a60085043015660015b600255",
-           "storage": {}
-       }
-       },
-       "exec" : {
-           "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-           "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "value" : "1000000000000000000",
-           "data" : "",
-           "gasPrice" : "100000000000000",
-           "gas" : "100000"
-       }
-   }
-}
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6023600a60085043015660015b600255",
+                "nonce": "0",
+                "storage": {}
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJump0_withoutJumpdestFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJump0_withoutJumpdestFiller.json
index d0f561f34..6adcd57a0 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJump0_withoutJumpdestFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJump0_withoutJumpdestFiller.json
@@ -1,29 +1,29 @@
 {
     "BlockNumberDynamicJump0_withoutJumpdest": {
-       "env" : {
-       "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-       "currentNumber" : "2",
-       "currentGasLimit" : "1000000",
-       "currentDifficulty" : "256",
-       "currentTimestamp" : "1",
-       "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-       },
-       "pre" : {
-       "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "100000000000000000000000",
-           "nonce" : "0",
-           "code" : "0x602360074301566001600255",
-           "storage": {}
-       }
-       },
-       "exec" : {
-           "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-           "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "value" : "1000000000000000000",
-           "data" : "",
-           "gasPrice" : "100000000000000",
-           "gas" : "100000"
-       }
-   }
-}
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "2",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x602360074301566001600255",
+                "nonce": "0",
+                "storage": {}
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJump1Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJump1Filler.json
index d9aebfb73..0bc700d2b 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJump1Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJump1Filler.json
@@ -1,29 +1,29 @@
 {
     "BlockNumberDynamicJump1": {
-       "env" : {
-       "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-       "currentNumber" : "2",
-       "currentGasLimit" : "1000000",
-       "currentDifficulty" : "256",
-       "currentTimestamp" : "1",
-       "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-       },
-       "pre" : {
-       "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "100000000000000000000000",
-           "nonce" : "0",
-           "code" : "0x620fffff620fffff01430156",
-           "storage": {}
-       }
-       },
-       "exec" : {
-           "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-           "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "value" : "1000000000000000000",
-           "data" : "",
-           "gasPrice" : "100000000000000",
-           "gas" : "100000"
-       }
-   }
-}
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "2",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x620fffff620fffff01430156",
+                "nonce": "0",
+                "storage": {}
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJumpInsidePushWithJumpDestFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJumpInsidePushWithJumpDestFiller.json
index c190ad7d3..14040fee2 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJumpInsidePushWithJumpDestFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJumpInsidePushWithJumpDestFiller.json
@@ -1,29 +1,29 @@
 {
     "BlockNumberDynamicJumpInsidePushWithJumpDest": {
-       "env" : {
-       "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-       "currentNumber" : "2",
-       "currentGasLimit" : "1000000",
-       "currentDifficulty" : "256",
-       "currentTimestamp" : "1",
-       "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-       },
-       "pre" : {
-       "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "100000000000000000000000",
-           "nonce" : "0",
-           "code" : "0x6004430156655b6001600155",
-           "storage": {}
-       }
-       },
-       "exec" : {
-           "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-           "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "value" : "1000000000000000000",
-           "data" : "",
-           "gasPrice" : "100000000000000",
-           "gas" : "100000"
-       }
-   }
-}
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "2",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6004430156655b6001600155",
+                "nonce": "0",
+                "storage": {}
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJumpInsidePushWithoutJumpDestFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJumpInsidePushWithoutJumpDestFiller.json
index 764b4bb2c..a0d5ed7d2 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJumpInsidePushWithoutJumpDestFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJumpInsidePushWithoutJumpDestFiller.json
@@ -1,29 +1,29 @@
 {
     "BlockNumberDynamicJumpInsidePushWithoutJumpDest": {
-       "env" : {
-       "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-       "currentNumber" : "2",
-       "currentGasLimit" : "1000000",
-       "currentDifficulty" : "256",
-       "currentTimestamp" : "1",
-       "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-       },
-       "pre" : {
-       "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "100000000000000000000000",
-           "nonce" : "0",
-           "code" : "0x600543015661eeff",
-           "storage": {}
-       }
-       },
-       "exec" : {
-           "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-           "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "value" : "1000000000000000000",
-           "data" : "",
-           "gasPrice" : "100000000000000",
-           "gas" : "100000"
-       }
-   }
-}
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "2",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x600543015661eeff",
+                "nonce": "0",
+                "storage": {}
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJumpi0Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJumpi0Filler.json
index 7227e08c8..e7159658e 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJumpi0Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJumpi0Filler.json
@@ -1,29 +1,29 @@
 {
     "BlockNumberDynamicJumpi0": {
-       "env" : {
-       "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-       "currentNumber" : "2",
-       "currentGasLimit" : "1000000",
-       "currentDifficulty" : "256",
-       "currentTimestamp" : "1",
-       "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-       },
-       "pre" : {
-       "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "100000000000000000000000",
-           "nonce" : "0",
-           "code" : "0x6023600160094301576001600255",
-           "storage": {}
-       }
-       },
-       "exec" : {
-           "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-           "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "value" : "1000000000000000000",
-           "data" : "",
-           "gasPrice" : "100000000000000",
-           "gas" : "100000"
-       }
-   }
-}
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "2",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6023600160094301576001600255",
+                "nonce": "0",
+                "storage": {}
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJumpi1Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJumpi1Filler.json
index b9cf47638..31d685aa8 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJumpi1Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJumpi1Filler.json
@@ -1,29 +1,29 @@
 {
     "BlockNumberDynamicJumpi1": {
-       "env" : {
-       "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-       "currentNumber" : "2",
-       "currentGasLimit" : "1000000",
-       "currentDifficulty" : "256",
-       "currentTimestamp" : "1",
-       "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-       },
-       "pre" : {
-       "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "100000000000000000000000",
-           "nonce" : "0",
-           "code" : "0x6023600060094301576001600255",
-           "storage": {}
-       }
-       },
-       "exec" : {
-           "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-           "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "value" : "1000000000000000000",
-           "data" : "",
-           "gasPrice" : "100000000000000",
-           "gas" : "100000"
-       }
-   }
-}
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "2",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6023600060094301576001600255",
+                "nonce": "0",
+                "storage": {}
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJumpi1_jumpdestFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJumpi1_jumpdestFiller.json
index b14220691..2229fed05 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJumpi1_jumpdestFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJumpi1_jumpdestFiller.json
@@ -1,29 +1,29 @@
 {
     "BlockNumberDynamicJumpi1_jumpdest": {
-       "env" : {
-       "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-       "currentNumber" : "2",
-       "currentGasLimit" : "1000000",
-       "currentDifficulty" : "256",
-       "currentTimestamp" : "1",
-       "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-       },
-       "pre" : {
-       "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "100000000000000000000000",
-           "nonce" : "0",
-           "code" : "0x60236001600a43015760015b600255",
-           "storage": {}
-       }
-       },
-       "exec" : {
-           "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-           "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "value" : "1000000000000000000",
-           "data" : "",
-           "gasPrice" : "100000000000000",
-           "gas" : "100000"
-       }
-   }
-}
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "2",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x60236001600a43015760015b600255",
+                "nonce": "0",
+                "storage": {}
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJumpiAfterStopFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJumpiAfterStopFiller.json
index 8fc80dec4..f3da09a61 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJumpiAfterStopFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJumpiAfterStopFiller.json
@@ -1,36 +1,36 @@
 {
     "BlockNumberDynamicJumpiAfterStop": {
-           "env" : {
-           "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-           "currentNumber" : "2",
-           "currentGasLimit" : "1000000",
-           "currentDifficulty" : "256",
-           "currentTimestamp" : "1",
-           "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-           },
-           "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x03" : "0x02"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "2",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x02"
                 }
             }
-           },
-           "pre" : {
-           "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-               "balance" : "100000000000000000000000",
-               "nonce" : "0",
-               "code" : "0x600160084301570060015b6002600355",
-               "storage": {}
-           }
-           },
-           "exec" : {
-               "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-               "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-               "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-               "value" : "1000000000000000000",
-               "data" : "",
-               "gasPrice" : "100000000000000",
-               "gas" : "100000"
-           }
-       }
-}
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x600160084301570060015b6002600355",
+                "nonce": "0",
+                "storage": {}
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJumpiOutsideBoundaryFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJumpiOutsideBoundaryFiller.json
index 87402ff19..1cbf286b8 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJumpiOutsideBoundaryFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJumpiOutsideBoundaryFiller.json
@@ -1,29 +1,29 @@
 {
     "BlockNumberDynamicJumpiOutsideBoundary": {
-       "env" : {
-       "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-       "currentNumber" : "2",
-       "currentGasLimit" : "1000000",
-       "currentDifficulty" : "256",
-       "currentTimestamp" : "1",
-       "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-       },
-       "pre" : {
-       "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "100000000000000000000000",
-           "nonce" : "0",
-           "code" : "0x60017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff04301576002600355",
-           "storage": {}
-       }
-       },
-       "exec" : {
-           "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-           "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "value" : "1000000000000000000",
-           "data" : "",
-           "gasPrice" : "100000000000000",
-           "gas" : "100000"
-       }
-   }
-}
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "2",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x60017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff04301576002600355",
+                "nonce": "0",
+                "storage": {}
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJumpifInsidePushWithJumpDestFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJumpifInsidePushWithJumpDestFiller.json
index fb9616eb3..6b1b3beee 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJumpifInsidePushWithJumpDestFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJumpifInsidePushWithJumpDestFiller.json
@@ -1,29 +1,29 @@
 {
     "BlockNumberDynamicJumpifInsidePushWithJumpDest": {
-       "env" : {
-       "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-       "currentNumber" : "2",
-       "currentGasLimit" : "1000000",
-       "currentDifficulty" : "256",
-       "currentTimestamp" : "1",
-       "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-       },
-       "pre" : {
-       "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "100000000000000000000000",
-           "nonce" : "0",
-           "code" : "0x60016006430157655b6001600155",
-           "storage": {}
-       }
-       },
-       "exec" : {
-           "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-           "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "value" : "1000000000000000000",
-           "data" : "",
-           "gasPrice" : "100000000000000",
-           "gas" : "100000"
-       }
-   }
-}
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "2",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x60016006430157655b6001600155",
+                "nonce": "0",
+                "storage": {}
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJumpifInsidePushWithoutJumpDestFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJumpifInsidePushWithoutJumpDestFiller.json
index 7a295321b..7a0f345b3 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJumpifInsidePushWithoutJumpDestFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/BlockNumberDynamicJumpifInsidePushWithoutJumpDestFiller.json
@@ -1,29 +1,29 @@
 {
     "BlockNumberDynamicJumpifInsidePushWithoutJumpDest": {
-       "env" : {
-       "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-       "currentNumber" : "2",
-       "currentGasLimit" : "1000000",
-       "currentDifficulty" : "256",
-       "currentTimestamp" : "1",
-       "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-       },
-       "pre" : {
-       "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "100000000000000000000000",
-           "nonce" : "0",
-           "code" : "0x6001600743015761eeff",
-           "storage": {}
-       }
-       },
-       "exec" : {
-           "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-           "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "value" : "1000000000000000000",
-           "data" : "",
-           "gasPrice" : "100000000000000",
-           "gas" : "100000"
-       }
-   }
-}
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "2",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6001600743015761eeff",
+                "nonce": "0",
+                "storage": {}
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/DyanmicJump0_outOfBoundaryFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/DyanmicJump0_outOfBoundaryFiller.json
index 919d7e2e7..2121e79d9 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/DyanmicJump0_outOfBoundaryFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/DyanmicJump0_outOfBoundaryFiller.json
@@ -1,32 +1,31 @@
 {
     "DyanmicJump0_outOfBoundary": {
-       "env" : {
-       "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-       "currentNumber" : "2",
-       "currentGasLimit" : "1000000",
-       "currentDifficulty" : "256",
-       "currentTimestamp" : "1",
-       "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-       },
-       "pre" : {
-       "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "100000000000000000000000",
-           "nonce" : "0",
-           "code" : "0x6023600760005401566001600255",
-           "storage" : {
-                   "0x00" : "0x04"
-               }
-
-       }
-       },
-       "exec" : {
-           "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-           "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "value" : "1000000000000000000",
-           "data" : "",
-           "gasPrice" : "100000000000000",
-           "gas" : "100000"
-       }
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "2",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6023600760005401566001600255",
+                "nonce": "0",
+                "storage": {
+                    "0x00": "0x04"
+                }
+            }
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump0_AfterJumpdest3Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump0_AfterJumpdest3Filler.json
index 3771c647a..e2639ea9b 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump0_AfterJumpdest3Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump0_AfterJumpdest3Filler.json
@@ -1,29 +1,29 @@
 {
     "DynamicJump0_AfterJumpdest3": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x6023600b6008506003015660015b600255",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6023600b6008506003015660015b600255",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump0_AfterJumpdestFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump0_AfterJumpdestFiller.json
index 65ecc584b..1988685f9 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump0_AfterJumpdestFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump0_AfterJumpdestFiller.json
@@ -1,29 +1,29 @@
 {
     "DynamicJump0_AfterJumpdest": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x602360086003015660015b600255",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x602360086003015660015b600255",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump0_foreverOutOfGasFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump0_foreverOutOfGasFiller.json
index 0ef8b7279..a21bb2a5b 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump0_foreverOutOfGasFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump0_foreverOutOfGasFiller.json
@@ -1,29 +1,29 @@
 {
     "DynamicJump0_foreverOutOfGas": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x5b600060000156",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x5b600060000156",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump0_jumpdest0Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump0_jumpdest0Filler.json
index bc452debb..b4291e875 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump0_jumpdest0Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump0_jumpdest0Filler.json
@@ -1,36 +1,36 @@
 {
     "DynamicJump0_jumpdest0": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x02" : "0x23"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x02": "0x23"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x602360076003015660015b600255",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x602360076003015660015b600255",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump0_jumpdest2Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump0_jumpdest2Filler.json
index 331d3a0f4..3db04513e 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump0_jumpdest2Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump0_jumpdest2Filler.json
@@ -1,36 +1,36 @@
 {
     "DynamicJump0_jumpdest2": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x02" : "0x23"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x02": "0x23"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x6023600a6008506003015660015b600255",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6023600a6008506003015660015b600255",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump0_withoutJumpdestFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump0_withoutJumpdestFiller.json
index 11d53e405..016ec5102 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump0_withoutJumpdestFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump0_withoutJumpdestFiller.json
@@ -1,29 +1,29 @@
 {
     "DynamicJump0_withoutJumpdest": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x60236007600301566001600255",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x60236007600301566001600255",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump1Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump1Filler.json
index ecf626f80..1f32b52da 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump1Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump1Filler.json
@@ -1,29 +1,29 @@
 {
     "DynamicJump1": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x620fffff620fffff0160030156",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x620fffff620fffff0160030156",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpAfterStopFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpAfterStopFiller.json
index ce513046b..eca7b1e03 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpAfterStopFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpAfterStopFiller.json
@@ -1,36 +1,36 @@
 {
     "DynamicJumpAfterStop": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x03" : "0x02"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x02"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x6008600101560060015b6002600355",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6008600101560060015b6002600355",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpInsidePushWithJumpDestFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpInsidePushWithJumpDestFiller.json
index 388effd08..25a664181 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpInsidePushWithJumpDestFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpInsidePushWithJumpDestFiller.json
@@ -1,29 +1,29 @@
 {
     "DynamicJumpInsidePushWithJumpDest": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x600460030156655b6001600155",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x600460030156655b6001600155",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpInsidePushWithoutJumpDestFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpInsidePushWithoutJumpDestFiller.json
index 70c8e6bb7..62ea5a43b 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpInsidePushWithoutJumpDestFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpInsidePushWithoutJumpDestFiller.json
@@ -1,29 +1,29 @@
 {
     "DynamicJumpInsidePushWithoutJumpDest": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x60056003015661eeff",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x60056003015661eeff",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpJD_DependsOnJumps0Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpJD_DependsOnJumps0Filler.json
index e389ccc08..14b176926 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpJD_DependsOnJumps0Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpJD_DependsOnJumps0Filler.json
@@ -1,30 +1,30 @@
 {
     "DynamicJumpJD_DependsOnJumps0": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "1",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "1",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-               "//" : "3 JUMP",
-            "code" : "0x6009436006575b566001",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "//": "3 JUMP",
+                "balance": "100000000000000000000000",
+                "code": "0x6009436006575b566001",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpJD_DependsOnJumps1Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpJD_DependsOnJumps1Filler.json
index 3ee59d96a..1700bbead 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpJD_DependsOnJumps1Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpJD_DependsOnJumps1Filler.json
@@ -1,36 +1,36 @@
 {
     "DynamicJumpJD_DependsOnJumps1": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "1",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "1",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x01" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x01": "0x01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x600a436006575b5660015b6001600155",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x600a436006575b5660015b6001600155",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpPathologicalTest0Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpPathologicalTest0Filler.json
index 7ef2c601b..65a6dd873 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpPathologicalTest0Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpPathologicalTest0Filler.json
@@ -1,36 +1,36 @@
 {
     "DynamicJumpPathologicalTest0": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "4",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "4",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x01" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x01": "0x01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x435660615b4343025660615b60615b5b5b6001600155",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x435660615b4343025660615b60615b5b5b6001600155",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpPathologicalTest1Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpPathologicalTest1Filler.json
index a280a42c6..d285be147 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpPathologicalTest1Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpPathologicalTest1Filler.json
@@ -1,29 +1,29 @@
 {
     "DynamicJumpPathologicalTest1": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "4",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "4",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x435660615b4343025660615b60615b605b6001600155",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x435660615b4343025660615b60615b605b6001600155",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpPathologicalTest2Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpPathologicalTest2Filler.json
index c1242377a..0f9d2a41c 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpPathologicalTest2Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpPathologicalTest2Filler.json
@@ -1,29 +1,29 @@
 {
     "DynamicJumpPathologicalTest2": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "4",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "4",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x435631615b60615b60615b606001600155",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x435631615b60615b60615b606001600155",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpPathologicalTest3Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpPathologicalTest3Filler.json
index acfdeb6ce..e2d83343e 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpPathologicalTest3Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpPathologicalTest3Filler.json
@@ -1,29 +1,29 @@
 {
     "DynamicJumpPathologicalTest3": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "7",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "7",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x435631615b60615b60615b606001600155",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x435631615b60615b60615b606001600155",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpStartWithJumpDestFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpStartWithJumpDestFiller.json
index c94dc7849..6c8708219 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpStartWithJumpDestFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpStartWithJumpDestFiller.json
@@ -1,36 +1,36 @@
 {
     "DynamicJumpStartWithJumpDest": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x" : "0x12"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x12"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x5b586000555960115758600052596000575b58600055",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x5b586000555960115758600052596000575b58600055",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump_value1Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump_value1Filler.json
index ad4939305..de2e1a0fc 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump_value1Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump_value1Filler.json
@@ -1,30 +1,30 @@
 {
     "DynamicJump_value1": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "_code" : "(asm 1 2 3 CALLVALUE JUMP JUMPDEST POP POP 0 MSTORE MSIZE 0 RETURN JUMPDEST POP 0 MSTORE MSIZE 0 RETURN JUMPDEST 0 MSTORE MSIZE 0 RETURN)",
-            "code" : "0x60016002600334565b5050600052596000f35b50600052596000f35b600052596000f3",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "8"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "8",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "_code": "(asm 1 2 3 CALLVALUE JUMP JUMPDEST POP POP 0 MSTORE MSIZE 0 RETURN JUMPDEST POP 0 MSTORE MSIZE 0 RETURN JUMPDEST 0 MSTORE MSIZE 0 RETURN)",
+                "balance": "100000000000000000000000",
+                "code": "0x60016002600334565b5050600052596000f35b50600052596000f35b600052596000f3",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump_value2Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump_value2Filler.json
index 02104cf27..e34f6c63d 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump_value2Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump_value2Filler.json
@@ -1,30 +1,30 @@
 {
     "DynamicJump_value2": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "_code" : "(asm 1 2 3 CALLVALUE JUMP JUMPDEST POP POP 0 MSTORE MSIZE 0 RETURN JUMPDEST POP 0 MSTORE MSIZE 0 RETURN JUMPDEST 0 MSTORE MSIZE 0 RETURN)",
-            "code" : "0x60016002600334565b5050600052596000f35b50600052596000f35b600052596000f3",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "18"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "18",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "_code": "(asm 1 2 3 CALLVALUE JUMP JUMPDEST POP POP 0 MSTORE MSIZE 0 RETURN JUMPDEST POP 0 MSTORE MSIZE 0 RETURN JUMPDEST 0 MSTORE MSIZE 0 RETURN)",
+                "balance": "100000000000000000000000",
+                "code": "0x60016002600334565b5050600052596000f35b50600052596000f35b600052596000f3",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump_value3Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump_value3Filler.json
index 851354fb3..1e9fa0f77 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump_value3Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump_value3Filler.json
@@ -1,30 +1,30 @@
 {
     "DynamicJump_value3": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "_code" : "(asm 1 2 3 CALLVALUE JUMP JUMPDEST POP POP 0 MSTORE MSIZE 0 RETURN JUMPDEST POP 0 MSTORE MSIZE 0 RETURN JUMPDEST 0 MSTORE MSIZE 0 RETURN)",
-            "code":"0x60016002600334565b5050600052596000f35b50600052596000f35b600052596000f3",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "27"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "27",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "_code": "(asm 1 2 3 CALLVALUE JUMP JUMPDEST POP POP 0 MSTORE MSIZE 0 RETURN JUMPDEST POP 0 MSTORE MSIZE 0 RETURN JUMPDEST 0 MSTORE MSIZE 0 RETURN)",
+                "balance": "100000000000000000000000",
+                "code": "0x60016002600334565b5050600052596000f35b50600052596000f35b600052596000f3",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump_valueUnderflowFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump_valueUnderflowFiller.json
index 765263d62..a5c972de0 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump_valueUnderflowFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJump_valueUnderflowFiller.json
@@ -1,30 +1,30 @@
 {
     "DynamicJump_valueUnderflow": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "_code" : "(asm 1 2 3 CALLVALUE JUMP JUMPDEST POP POP 0 MSTORE MSIZE 0 RETURN JUMPDEST POP 0 MSTORE MSIZE 0 RETURN JUMPDEST POP POP POP 0 MSTORE MSIZE 0 RETURN)",
-            "code" : "0x60016002600334565b5050600052596000f35b50600052596000f35b505050600052596000f3",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "27"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "27",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "_code": "(asm 1 2 3 CALLVALUE JUMP JUMPDEST POP POP 0 MSTORE MSIZE 0 RETURN JUMPDEST POP 0 MSTORE MSIZE 0 RETURN JUMPDEST POP POP POP 0 MSTORE MSIZE 0 RETURN)",
+                "balance": "100000000000000000000000",
+                "code": "0x60016002600334565b5050600052596000f35b50600052596000f35b505050600052596000f3",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpi0Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpi0Filler.json
index 696bf44fd..5b81127ca 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpi0Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpi0Filler.json
@@ -1,29 +1,29 @@
 {
     "DynamicJumpi0": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x602360016009600301576001600255",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x602360016009600301576001600255",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpi1Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpi1Filler.json
index 08a732805..77b19b290 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpi1Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpi1Filler.json
@@ -1,36 +1,36 @@
 {
     "DynamicJumpi1": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x02" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x02": "0x01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x602360006009600301576001600255",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x602360006009600301576001600255",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpi1_jumpdestFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpi1_jumpdestFiller.json
index 0b5ed45e9..259e7c87a 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpi1_jumpdestFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpi1_jumpdestFiller.json
@@ -1,29 +1,29 @@
 {
     "DynamicJumpi1_jumpdest": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x60236001600a6003015760015b600255",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x60236001600a6003015760015b600255",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpiAfterStopFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpiAfterStopFiller.json
index 13d7a0eb3..ce81ff6c8 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpiAfterStopFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpiAfterStopFiller.json
@@ -1,36 +1,36 @@
 {
     "DynamicJumpiAfterStop": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x03" : "0x02"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x02"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x60016008600301570060015b6002600355",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x60016008600301570060015b6002600355",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpiOutsideBoundaryFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpiOutsideBoundaryFiller.json
index 89f25d19a..a29266f0d 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpiOutsideBoundaryFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpiOutsideBoundaryFiller.json
@@ -1,29 +1,29 @@
 {
     "DynamicJumpiOutsideBoundary": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x60017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0600301576002600355",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x60017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0600301576002600355",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpifInsidePushWithJumpDestFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpifInsidePushWithJumpDestFiller.json
index c5621dc81..a4dd304f7 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpifInsidePushWithJumpDestFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpifInsidePushWithJumpDestFiller.json
@@ -1,29 +1,29 @@
 {
     "DynamicJumpifInsidePushWithJumpDest": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x6001600660030157655b6001600155",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6001600660030157655b6001600155",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpifInsidePushWithoutJumpDestFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpifInsidePushWithoutJumpDestFiller.json
index 74369cb4d..fcf5d0c7b 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpifInsidePushWithoutJumpDestFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/DynamicJumpifInsidePushWithoutJumpDestFiller.json
@@ -1,29 +1,29 @@
 {
     "DynamicJumpifInsidePushWithoutJumpDest": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x600160076003015761eeff",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x600160076003015761eeff",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJump0_AfterJumpdest3Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJump0_AfterJumpdest3Filler.json
index 6408cc745..4544502c7 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJump0_AfterJumpdest3Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJump0_AfterJumpdest3Filler.json
@@ -1,31 +1,31 @@
 {
     "JDfromStorageDynamicJump0_AfterJumpdest3": {
-       "env" : {
-       "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-       "currentNumber" : "2",
-       "currentGasLimit" : "1000000",
-       "currentDifficulty" : "256",
-       "currentTimestamp" : "1",
-       "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-       },
-       "pre" : {
-       "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "100000000000000000000000",
-           "nonce" : "0",
-           "code" : "0x6023600b600850600054015660015b600255",
-           "storage" : {
-                   "0x00" : "0x04"
-               }
-       }
-       },
-       "exec" : {
-           "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-           "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "value" : "1000000000000000000",
-           "data" : "",
-           "gasPrice" : "100000000000000",
-           "gas" : "100000"
-       }
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "2",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6023600b600850600054015660015b600255",
+                "nonce": "0",
+                "storage": {
+                    "0x00": "0x04"
+                }
+            }
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJump0_AfterJumpdestFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJump0_AfterJumpdestFiller.json
index 3ed784486..1b3f805e9 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJump0_AfterJumpdestFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJump0_AfterJumpdestFiller.json
@@ -1,31 +1,31 @@
 {
     "JDfromStorageDynamicJump0_AfterJumpdest": {
-       "env" : {
-       "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-       "currentNumber" : "2",
-       "currentGasLimit" : "1000000",
-       "currentDifficulty" : "256",
-       "currentTimestamp" : "1",
-       "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-       },
-       "pre" : {
-       "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "100000000000000000000000",
-           "nonce" : "0",
-           "code" : "0x60236008600054015660015b600255",
-           "storage" : {
-                   "0x00" : "0x04"
-               }
-       }
-       },
-       "exec" : {
-           "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-           "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "value" : "1000000000000000000",
-           "data" : "",
-           "gasPrice" : "100000000000000",
-           "gas" : "100000"
-       }
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "2",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x60236008600054015660015b600255",
+                "nonce": "0",
+                "storage": {
+                    "0x00": "0x04"
+                }
+            }
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJump0_foreverOutOfGasFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJump0_foreverOutOfGasFiller.json
index ff12bbd8b..755acb764 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJump0_foreverOutOfGasFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJump0_foreverOutOfGasFiller.json
@@ -1,31 +1,31 @@
 {
     "JDfromStorageDynamicJump0_foreverOutOfGas": {
-       "env" : {
-       "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-       "currentNumber" : "2",
-       "currentGasLimit" : "1000000",
-       "currentDifficulty" : "256",
-       "currentTimestamp" : "1",
-       "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-       },
-       "pre" : {
-       "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "100000000000000000000000",
-           "nonce" : "0",
-           "code" : "0x5b600060000156",
-           "storage" : {
-                   "0x00" : "0x04"
-               }
-       }
-       },
-       "exec" : {
-           "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-           "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "value" : "1000000000000000000",
-           "data" : "",
-           "gasPrice" : "100000000000000",
-           "gas" : "100000"
-       }
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "2",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x5b600060000156",
+                "nonce": "0",
+                "storage": {
+                    "0x00": "0x04"
+                }
+            }
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJump0_jumpdest0Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJump0_jumpdest0Filler.json
index 27eea12e1..9bb8b6d13 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJump0_jumpdest0Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJump0_jumpdest0Filler.json
@@ -1,39 +1,39 @@
 {
     "JDfromStorageDynamicJump0_jumpdest0": {
-       "env" : {
-       "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-       "currentNumber" : "2",
-       "currentGasLimit" : "1000000",
-       "currentDifficulty" : "256",
-       "currentTimestamp" : "1",
-       "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-       },
-       "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x" : "0x04",
-                    "0x02" : "0x23"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "2",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x04",
+                    "0x02": "0x23"
                 }
             }
-       },
-       "pre" : {
-       "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "100000000000000000000000",
-           "nonce" : "0",
-           "code" : "0x60236007600054015660015b600255",
-           "storage" : {
-                   "0x00" : "0x04"
-               }
-       }
-       },
-       "exec" : {
-           "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-           "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "value" : "1000000000000000000",
-           "data" : "",
-           "gasPrice" : "100000000000000",
-           "gas" : "100000"
-       }
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x60236007600054015660015b600255",
+                "nonce": "0",
+                "storage": {
+                    "0x00": "0x04"
+                }
+            }
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJump0_jumpdest2Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJump0_jumpdest2Filler.json
index 9f63b60ce..ce415bdd7 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJump0_jumpdest2Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJump0_jumpdest2Filler.json
@@ -1,40 +1,39 @@
 {
     "JDfromStorageDynamicJump0_jumpdest2": {
-       "env" : {
-       "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-       "currentNumber" : "2",
-       "currentGasLimit" : "1000000",
-       "currentDifficulty" : "256",
-       "currentTimestamp" : "1",
-       "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-       },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x" : "0x04",
-                    "0x02" : "0x23"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "2",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x04",
+                    "0x02": "0x23"
                 }
             }
         },
-       "pre" : {
-       "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "100000000000000000000000",
-           "nonce" : "0",
-           "code" : "0x6023600a600850600054015660015b600255",
-           "storage" : {
-                   "0x00" : "0x04"
-               }
-
-       }
-       },
-       "exec" : {
-           "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-           "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "value" : "1000000000000000000",
-           "data" : "",
-           "gasPrice" : "100000000000000",
-           "gas" : "100000"
-       }
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6023600a600850600054015660015b600255",
+                "nonce": "0",
+                "storage": {
+                    "0x00": "0x04"
+                }
+            }
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJump0_withoutJumpdestFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJump0_withoutJumpdestFiller.json
index 2aa19939d..55b1db6d3 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJump0_withoutJumpdestFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJump0_withoutJumpdestFiller.json
@@ -1,32 +1,31 @@
 {
     "JDfromStorageDynamicJump0_withoutJumpdest": {
-       "env" : {
-       "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-       "currentNumber" : "2",
-       "currentGasLimit" : "1000000",
-       "currentDifficulty" : "256",
-       "currentTimestamp" : "1",
-       "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-       },
-       "pre" : {
-       "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "100000000000000000000000",
-           "nonce" : "0",
-           "code" : "0x6023600760005401566001600255",
-           "storage" : {
-                   "0x00" : "0x04"
-               }
-
-       }
-       },
-       "exec" : {
-           "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-           "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "value" : "1000000000000000000",
-           "data" : "",
-           "gasPrice" : "100000000000000",
-           "gas" : "100000"
-       }
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "2",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6023600760005401566001600255",
+                "nonce": "0",
+                "storage": {
+                    "0x00": "0x04"
+                }
+            }
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJump1Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJump1Filler.json
index f100eb556..f8cd31356 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJump1Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJump1Filler.json
@@ -1,32 +1,31 @@
 {
     "JDfromStorageDynamicJump1": {
-       "env" : {
-       "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-       "currentNumber" : "2",
-       "currentGasLimit" : "1000000",
-       "currentDifficulty" : "256",
-       "currentTimestamp" : "1",
-       "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-       },
-       "pre" : {
-       "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "100000000000000000000000",
-           "nonce" : "0",
-           "code" : "0x620fffff620fffff016000540156",
-           "storage" : {
-                   "0x00" : "0x04"
-               }
-
-       }
-       },
-       "exec" : {
-           "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-           "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "value" : "1000000000000000000",
-           "data" : "",
-           "gasPrice" : "100000000000000",
-           "gas" : "100000"
-       }
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "2",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x620fffff620fffff016000540156",
+                "nonce": "0",
+                "storage": {
+                    "0x00": "0x04"
+                }
+            }
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJumpInsidePushWithJumpDestFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJumpInsidePushWithJumpDestFiller.json
index 5b8cc2ba4..2370fc363 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJumpInsidePushWithJumpDestFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJumpInsidePushWithJumpDestFiller.json
@@ -1,31 +1,31 @@
 {
     "JDfromStorageDynamicJumpInsidePushWithJumpDest": {
-       "env" : {
-       "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-       "currentNumber" : "2",
-       "currentGasLimit" : "1000000",
-       "currentDifficulty" : "256",
-       "currentTimestamp" : "1",
-       "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-       },
-       "pre" : {
-       "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "100000000000000000000000",
-           "nonce" : "0",
-           "code" : "0x60046000540156655b6001600155",
-           "storage" : {
-                   "0x00" : "0x04"
-               }
-       }
-       },
-       "exec" : {
-           "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-           "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "value" : "1000000000000000000",
-           "data" : "",
-           "gasPrice" : "100000000000000",
-           "gas" : "100000"
-       }
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "2",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x60046000540156655b6001600155",
+                "nonce": "0",
+                "storage": {
+                    "0x00": "0x04"
+                }
+            }
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJumpInsidePushWithoutJumpDestFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJumpInsidePushWithoutJumpDestFiller.json
index 9db69f286..393a35c85 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJumpInsidePushWithoutJumpDestFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJumpInsidePushWithoutJumpDestFiller.json
@@ -1,31 +1,31 @@
 {
     "JDfromStorageDynamicJumpInsidePushWithoutJumpDest": {
-       "env" : {
-       "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-       "currentNumber" : "2",
-       "currentGasLimit" : "1000000",
-       "currentDifficulty" : "256",
-       "currentTimestamp" : "1",
-       "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-       },
-       "pre" : {
-       "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "100000000000000000000000",
-           "nonce" : "0",
-           "code" : "0x6005600054015661eeff",
-           "storage" : {
-                   "0x00" : "0x04"
-               }
-       }
-       },
-       "exec" : {
-           "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-           "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "value" : "1000000000000000000",
-           "data" : "",
-           "gasPrice" : "100000000000000",
-           "gas" : "100000"
-       }
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "2",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6005600054015661eeff",
+                "nonce": "0",
+                "storage": {
+                    "0x00": "0x04"
+                }
+            }
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJumpi0Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJumpi0Filler.json
index 2237ecc8d..21b9de0b1 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJumpi0Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJumpi0Filler.json
@@ -1,31 +1,31 @@
 {
     "JDfromStorageDynamicJumpi0": {
-       "env" : {
-       "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-       "currentNumber" : "2",
-       "currentGasLimit" : "1000000",
-       "currentDifficulty" : "256",
-       "currentTimestamp" : "1",
-       "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-       },
-       "pre" : {
-       "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "100000000000000000000000",
-           "nonce" : "0",
-           "code" : "0x60236001600960005401576001600255",
-           "storage" : {
-                   "0x00" : "0x04"
-               }
-       }
-       },
-       "exec" : {
-           "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-           "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "value" : "1000000000000000000",
-           "data" : "",
-           "gasPrice" : "100000000000000",
-           "gas" : "100000"
-       }
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "2",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x60236001600960005401576001600255",
+                "nonce": "0",
+                "storage": {
+                    "0x00": "0x04"
+                }
+            }
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJumpi1Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJumpi1Filler.json
index 2513232a0..f5d46dfb1 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJumpi1Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJumpi1Filler.json
@@ -1,31 +1,31 @@
 {
     "JDfromStorageDynamicJumpi1": {
-       "env" : {
-       "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-       "currentNumber" : "2",
-       "currentGasLimit" : "1000000",
-       "currentDifficulty" : "256",
-       "currentTimestamp" : "1",
-       "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-       },
-       "pre" : {
-       "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "100000000000000000000000",
-           "nonce" : "0",
-           "code" : "0x60236000600960005401576001600255",
-           "storage" : {
-                   "0x00" : "0x04"
-               }
-       }
-       },
-       "exec" : {
-           "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-           "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "value" : "1000000000000000000",
-           "data" : "",
-           "gasPrice" : "100000000000000",
-           "gas" : "100000"
-       }
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "2",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x60236000600960005401576001600255",
+                "nonce": "0",
+                "storage": {
+                    "0x00": "0x04"
+                }
+            }
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJumpi1_jumpdestFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJumpi1_jumpdestFiller.json
index aa76fd79f..8a04ee453 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJumpi1_jumpdestFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJumpi1_jumpdestFiller.json
@@ -1,32 +1,31 @@
 {
     "JDfromStorageDynamicJumpi1_jumpdest": {
-       "env" : {
-       "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-       "currentNumber" : "2",
-       "currentGasLimit" : "1000000",
-       "currentDifficulty" : "256",
-       "currentTimestamp" : "1",
-       "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-       },
-       "pre" : {
-       "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "100000000000000000000000",
-           "nonce" : "0",
-           "code" : "0x60236001600a600054015760015b600255",
-           "storage" : {
-                   "0x00" : "0x04"
-               }
-
-       }
-       },
-       "exec" : {
-           "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-           "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "value" : "1000000000000000000",
-           "data" : "",
-           "gasPrice" : "100000000000000",
-           "gas" : "100000"
-       }
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "2",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x60236001600a600054015760015b600255",
+                "nonce": "0",
+                "storage": {
+                    "0x00": "0x04"
+                }
+            }
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJumpiAfterStopFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJumpiAfterStopFiller.json
index a4bbc3adc..b2e821dd4 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJumpiAfterStopFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJumpiAfterStopFiller.json
@@ -1,39 +1,39 @@
 {
     "JDfromStorageDynamicJumpiAfterStop": {
-           "env" : {
-           "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-           "currentNumber" : "2",
-           "currentGasLimit" : "1000000",
-           "currentDifficulty" : "256",
-           "currentTimestamp" : "1",
-           "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-           },
-           "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x" : "0x04",
-                    "0x03" : "0x02"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "2",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x04",
+                    "0x03": "0x02"
                 }
             }
-           },
-           "pre" : {
-           "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-               "balance" : "100000000000000000000000",
-               "nonce" : "0",
-               "code" : "0x6001600860005401570060015b6002600355",
-               "storage" : {
-                       "0x00" : "0x04"
-                   }
-           }
-           },
-           "exec" : {
-               "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-               "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-               "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-               "value" : "1000000000000000000",
-               "data" : "",
-               "gasPrice" : "100000000000000",
-               "gas" : "100000"
-           }
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6001600860005401570060015b6002600355",
+                "nonce": "0",
+                "storage": {
+                    "0x00": "0x04"
+                }
+            }
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJumpiOutsideBoundaryFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJumpiOutsideBoundaryFiller.json
index 6c05a3060..0335677c2 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJumpiOutsideBoundaryFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJumpiOutsideBoundaryFiller.json
@@ -1,31 +1,31 @@
 {
     "JDfromStorageDynamicJumpiOutsideBoundary": {
-       "env" : {
-       "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-       "currentNumber" : "2",
-       "currentGasLimit" : "1000000",
-       "currentDifficulty" : "256",
-       "currentTimestamp" : "1",
-       "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-       },
-       "pre" : {
-       "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "100000000000000000000000",
-           "nonce" : "0",
-           "code" : "0x60017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff060005401576002600355",
-           "storage" : {
-                   "0x00" : "0x04"
-               }
-       }
-       },
-       "exec" : {
-           "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-           "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "value" : "1000000000000000000",
-           "data" : "",
-           "gasPrice" : "100000000000000",
-           "gas" : "100000"
-       }
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "2",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x60017ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff060005401576002600355",
+                "nonce": "0",
+                "storage": {
+                    "0x00": "0x04"
+                }
+            }
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJumpifInsidePushWithJumpDestFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJumpifInsidePushWithJumpDestFiller.json
index b4cca0505..4b764248a 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJumpifInsidePushWithJumpDestFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJumpifInsidePushWithJumpDestFiller.json
@@ -1,31 +1,31 @@
 {
     "JDfromStorageDynamicJumpifInsidePushWithJumpDest": {
-       "env" : {
-       "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-       "currentNumber" : "2",
-       "currentGasLimit" : "1000000",
-       "currentDifficulty" : "256",
-       "currentTimestamp" : "1",
-       "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-       },
-       "pre" : {
-       "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "100000000000000000000000",
-           "nonce" : "0",
-           "code" : "0x600160066000540157655b6001600155",
-           "storage" : {
-                   "0x00" : "0x04"
-               }
-       }
-       },
-       "exec" : {
-           "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-           "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "value" : "1000000000000000000",
-           "data" : "",
-           "gasPrice" : "100000000000000",
-           "gas" : "100000"
-       }
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "2",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x600160066000540157655b6001600155",
+                "nonce": "0",
+                "storage": {
+                    "0x00": "0x04"
+                }
+            }
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJumpifInsidePushWithoutJumpDestFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJumpifInsidePushWithoutJumpDestFiller.json
index a8a2d331e..36029ae2b 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJumpifInsidePushWithoutJumpDestFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/JDfromStorageDynamicJumpifInsidePushWithoutJumpDestFiller.json
@@ -1,31 +1,31 @@
 {
     "JDfromStorageDynamicJumpifInsidePushWithoutJumpDest": {
-       "env" : {
-       "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-       "currentNumber" : "2",
-       "currentGasLimit" : "1000000",
-       "currentDifficulty" : "256",
-       "currentTimestamp" : "1",
-       "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-       },
-       "pre" : {
-       "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-           "balance" : "100000000000000000000000",
-           "nonce" : "0",
-           "code" : "0x60016007600054015761eeff",
-           "storage" : {
-                   "0x00" : "0x04"
-               }
-       }
-       },
-       "exec" : {
-           "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-           "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-           "value" : "1000000000000000000",
-           "data" : "",
-           "gasPrice" : "100000000000000",
-           "gas" : "100000"
-       }
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "2",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x60016007600054015761eeff",
+                "nonce": "0",
+                "storage": {
+                    "0x00": "0x04"
+                }
+            }
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/bad_indirect_jump1Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/bad_indirect_jump1Filler.json
index ef4dc599b..f2adc6b7b 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/bad_indirect_jump1Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/bad_indirect_jump1Filler.json
@@ -1,29 +1,29 @@
 {
     "bad_indirect_jump1": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "(asm 27 37 MUL JUMP JUMPDEST)",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "(asm 27 37 MUL JUMP JUMPDEST)",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/bad_indirect_jump2Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/bad_indirect_jump2Filler.json
index 7df9f3d4c..144733b90 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/bad_indirect_jump2Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/bad_indirect_jump2Filler.json
@@ -1,29 +1,29 @@
 {
     "bad_indirect_jump2": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "(asm 1 3 3 MUL JUMPI 0 0 JUMP)",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "(asm 1 3 3 MUL JUMPI 0 0 JUMP)",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/byte1Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/byte1Filler.json
index 69c29a891..b8c99be64 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/byte1Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/byte1Filler.json
@@ -1,29 +1,29 @@
 {
     "byte1": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "(asm 0x112233445566778899001122334455667788990011223344556677889900aabb 0 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 1 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 2 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 3 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 4 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 5 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 6 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 7 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 8 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 9 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 10 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 11 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 12 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 13 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 14 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 15 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 16 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 17 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 18 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 19 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 20 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 21 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 22 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 23 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 24 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 25 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 26 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 27 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 28 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 29 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 30 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 31 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 32 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 2014 BYTE 0 0 SSTORE)",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "(asm 0x112233445566778899001122334455667788990011223344556677889900aabb 0 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 1 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 2 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 3 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 4 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 5 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 6 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 7 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 8 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 9 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 10 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 11 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 12 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 13 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 14 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 15 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 16 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 17 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 18 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 19 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 20 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 21 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 22 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 23 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 24 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 25 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 26 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 27 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 28 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 29 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 30 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 31 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 32 BYTE 0x112233445566778899001122334455667788990011223344556677889900aabb 2014 BYTE 0 0 SSTORE)",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/calldatacopyMemExpFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/calldatacopyMemExpFiller.json
index 59db2b4db..96ddb3e27 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/calldatacopyMemExpFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/calldatacopyMemExpFiller.json
@@ -1,29 +1,29 @@
 {
     "calldatacopyMemExp": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "8390000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "8390000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x60ff60ff630fffffff630fffffff37",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "8390000000",
+            "gasPrice": "1",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "1",
-            "gas" : "8390000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x60ff60ff630fffffff630fffffff37",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/codecopyMemExpFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/codecopyMemExpFiller.json
index 2a812b17a..5a3e3c94a 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/codecopyMemExpFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/codecopyMemExpFiller.json
@@ -1,29 +1,29 @@
 {
     "codecopyMemExp": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "8390000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "8390000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x60ff60ff630fffffff630fffffff39",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "8390000000",
+            "gasPrice": "1",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "1",
-            "gas" : "8390000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x60ff60ff630fffffff630fffffff39",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/deadCode_1Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/deadCode_1Filler.json
index 370373105..32ea5e900 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/deadCode_1Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/deadCode_1Filler.json
@@ -1,29 +1,29 @@
 {
     "deadCode_1": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "(asm 1 0 MSTORE8 MSIZE 0 RETURN STOP STOP STOP STOP STOP STOP STOP STOP JUMPDEST STOP)",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "(asm 1 0 MSTORE8 MSIZE 0 RETURN STOP STOP STOP STOP STOP STOP STOP STOP JUMPDEST STOP)",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/dupAt51becameMloadFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/dupAt51becameMloadFiller.json
index 153af38d4..65025d83f 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/dupAt51becameMloadFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/dupAt51becameMloadFiller.json
@@ -1,36 +1,36 @@
 {
     "dupAt51becameMload": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x" : "0x02"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x02"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x600260035155",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x600260035155",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/for_loop1Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/for_loop1Filler.json
index cdcd4e0b4..3f9b2f7a5 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/for_loop1Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/for_loop1Filler.json
@@ -1,29 +1,29 @@
 {
     "for_loop1": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ (def 'i 0x80) (def 'j 0xA0) (for [i]:10 (> @i 0) [i](- @i 1) [j](+ @i @j)) }",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ (def 'i 0x80) (def 'j 0xA0) (for [i]:10 (> @i 0) [i](- @i 1) [j](+ @i @j)) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/for_loop2Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/for_loop2Filler.json
index dd6a26469..a42296257 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/for_loop2Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/for_loop2Filler.json
@@ -1,29 +1,29 @@
 {
     "for_loop2": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ (def 'i 0x80) (def 'j 0xA0) (for [i]:0 (< @i 10) [i](+ @i 1) [j](+ @i @j)) }",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ (def 'i 0x80) (def 'j 0xA0) (for [i]:0 (< @i 10) [i](+ @i 1) [j](+ @i @j)) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/gas0Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/gas0Filler.json
index e2748763f..ffaa1605c 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/gas0Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/gas0Filler.json
@@ -1,36 +1,36 @@
 {
     "gas0": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x" : "0x018680"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x018680"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "{(MSTORE 0 0xffffffffff)  (MSTORE 90 0xeeee) [[ 0 ]] (GAS)}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{(MSTORE 0 0xffffffffff)  (MSTORE 90 0xeeee) [[ 0 ]] (GAS)}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/gas1Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/gas1Filler.json
index da6bbdc31..25a0b5d92 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/gas1Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/gas1Filler.json
@@ -1,36 +1,36 @@
 {
     "gas1": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x" : "0x01869e"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01869e"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "{[[ 0 ]] (GAS)}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{[[ 0 ]] (GAS)}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/gasOverFlowFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/gasOverFlowFiller.json
index 901441cdc..d76c62222 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/gasOverFlowFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/gasOverFlowFiller.json
@@ -1,29 +1,29 @@
 {
     "gasOverFlow": {
-        "env" : {
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-            "currentNumber" : "0",
-            "currentGasLimit" : "1000000",
-            "currentDifficulty" : "256",
-            "currentTimestamp" : "1",
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "(asm 0x03 JUMPDEST 0x01 SWAP1 SUB DUP1 0x02 JUMPI 0x010000000000000016 JUMP JUMPDEST 0xbadf000d 0x11 SSTORE STOP )",
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "(asm 0x03 JUMPDEST 0x01 SWAP1 SUB DUP1 0x02 JUMPI 0x010000000000000016 JUMP JUMPDEST 0xbadf000d 0x11 SSTORE STOP )",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/indirect_jump1Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/indirect_jump1Filler.json
index c1ccd7a5d..c9966797e 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/indirect_jump1Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/indirect_jump1Filler.json
@@ -1,29 +1,29 @@
 {
     "indirect_jump1": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "(asm 4 3 ADD JUMP STOP JUMPDEST 1 0 MSTORE MSIZE 0 RETURN)",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "(asm 4 3 ADD JUMP STOP JUMPDEST 1 0 MSTORE MSIZE 0 RETURN)",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/indirect_jump2Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/indirect_jump2Filler.json
index aea70cd0d..1e91ce9bd 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/indirect_jump2Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/indirect_jump2Filler.json
@@ -1,29 +1,29 @@
 {
     "indirect_jump2": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "(asm 8 6 ADD JUMP STOP JUMPDEST 1 0 MSTORE STOP JUMPDEST 2 0 MSTORE MSIZE 0 RETURN)",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "(asm 8 6 ADD JUMP STOP JUMPDEST 1 0 MSTORE STOP JUMPDEST 2 0 MSTORE MSIZE 0 RETURN)",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/indirect_jump3Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/indirect_jump3Filler.json
index c9da4638a..c37c22cda 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/indirect_jump3Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/indirect_jump3Filler.json
@@ -1,29 +1,29 @@
 {
     "indirect_jump3": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "(asm  1 4 5 ADD JUMPI STOP JUMPDEST 1 0 MSTORE MSIZE 0 RETURN)",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "(asm  1 4 5 ADD JUMPI STOP JUMPDEST 1 0 MSTORE MSIZE 0 RETURN)",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/indirect_jump4Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/indirect_jump4Filler.json
index b06c5cfb1..22643052b 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/indirect_jump4Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/indirect_jump4Filler.json
@@ -1,29 +1,29 @@
 {
     "indirect_jump4": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "(asm 0 7 5 ADD JUMPI 1 0 MSTORE STOP JUMPDEST)",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "(asm 0 7 5 ADD JUMPI 1 0 MSTORE STOP JUMPDEST)",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/jump0_AfterJumpdest3Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/jump0_AfterJumpdest3Filler.json
index f7a6338c0..e9dfd19db 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/jump0_AfterJumpdest3Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/jump0_AfterJumpdest3Filler.json
@@ -1,29 +1,29 @@
 {
     "jump0_AfterJumpdest3": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x6023600b6008505660015b600255",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6023600b6008505660015b600255",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/jump0_AfterJumpdestFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/jump0_AfterJumpdestFiller.json
index 1e7e5b87e..783cfe756 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/jump0_AfterJumpdestFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/jump0_AfterJumpdestFiller.json
@@ -1,29 +1,29 @@
 {
     "jump0_AfterJumpdest": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x602360085660015b600255",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x602360085660015b600255",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/jump0_foreverOutOfGasFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/jump0_foreverOutOfGasFiller.json
index 4fe5166b8..733f18073 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/jump0_foreverOutOfGasFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/jump0_foreverOutOfGasFiller.json
@@ -1,29 +1,29 @@
 {
     "jump0_foreverOutOfGas": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x5b600056",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x5b600056",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/jump0_jumpdest0Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/jump0_jumpdest0Filler.json
index c2cad148a..3ea79232b 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/jump0_jumpdest0Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/jump0_jumpdest0Filler.json
@@ -1,36 +1,36 @@
 {
     "jump0_jumpdest0": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x02" : "0x23"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x02": "0x23"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x602360075660015b600255",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x602360075660015b600255",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/jump0_jumpdest2Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/jump0_jumpdest2Filler.json
index 491b2c7d5..8c65306dd 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/jump0_jumpdest2Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/jump0_jumpdest2Filler.json
@@ -1,36 +1,36 @@
 {
     "jump0_jumpdest2": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x02" : "0x23"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x02": "0x23"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x6023600a6008505660015b600255",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6023600a6008505660015b600255",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/jump0_outOfBoundaryFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/jump0_outOfBoundaryFiller.json
index ce3687489..4fce8309b 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/jump0_outOfBoundaryFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/jump0_outOfBoundaryFiller.json
@@ -1,29 +1,29 @@
 {
     "jump0_outOfBoundary": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x60236007566001600255",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x60236007566001600255",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/jump0_withoutJumpdestFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/jump0_withoutJumpdestFiller.json
index 4db1a8209..0ea564cdc 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/jump0_withoutJumpdestFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/jump0_withoutJumpdestFiller.json
@@ -1,29 +1,29 @@
 {
     "jump0_withoutJumpdest": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x60236007566001600255",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x60236007566001600255",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/jump1Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/jump1Filler.json
index 33668b235..86c4366de 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/jump1Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/jump1Filler.json
@@ -1,29 +1,29 @@
 {
     "jump1": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x620fffff620fffff0156",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x620fffff620fffff0156",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/jumpAfterStopFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/jumpAfterStopFiller.json
index 58260b383..d3fe1348d 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/jumpAfterStopFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/jumpAfterStopFiller.json
@@ -1,36 +1,36 @@
 {
     "jumpAfterStop": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x03" : "0x02"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x02"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x6006560060015b6002600355",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6006560060015b6002600355",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/jumpDynamicJumpSameDestFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/jumpDynamicJumpSameDestFiller.json
index d44b02567..0f7eca91a 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/jumpDynamicJumpSameDestFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/jumpDynamicJumpSameDestFiller.json
@@ -1,29 +1,29 @@
 {
     "jumpDynamicJumpSameDest": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x6002600401565b600360005260206000f3600656",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6002600401565b600360005260206000f3600656",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/jumpHighFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/jumpHighFiller.json
index a8c85d898..033519971 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/jumpHighFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/jumpHighFiller.json
@@ -1,36 +1,36 @@
 {
     "jumpHigh": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x01" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x01": "0x00"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-	    "code" : "( asm 0xfffffff JUMP JUMPDEST JUMPDEST 0x01 0x01 SSTORE )",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "( asm 0xfffffff JUMP JUMPDEST JUMPDEST 0x01 0x01 SSTORE )",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/jumpInsidePushWithJumpDestFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/jumpInsidePushWithJumpDestFiller.json
index 3584e6820..d495cd671 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/jumpInsidePushWithJumpDestFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/jumpInsidePushWithJumpDestFiller.json
@@ -1,29 +1,29 @@
 {
     "jumpInsidePushWithJumpDest": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x600456655b6001600155",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x600456655b6001600155",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/jumpInsidePushWithoutJumpDestFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/jumpInsidePushWithoutJumpDestFiller.json
index 10a209854..3cb8e3307 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/jumpInsidePushWithoutJumpDestFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/jumpInsidePushWithoutJumpDestFiller.json
@@ -1,29 +1,29 @@
 {
     "jumpInsidePushWithoutJumpDest": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x60055661eeff",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x60055661eeff",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/jumpOntoJumpFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/jumpOntoJumpFiller.json
index c12567395..89cfacae8 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/jumpOntoJumpFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/jumpOntoJumpFiller.json
@@ -1,29 +1,29 @@
 {
     "jumpOntoJump": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x565b600056",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x565b600056",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/jumpTo1InstructionafterJumpFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/jumpTo1InstructionafterJumpFiller.json
index 11b8d15d3..ac42ff502 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/jumpTo1InstructionafterJumpFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/jumpTo1InstructionafterJumpFiller.json
@@ -1,29 +1,29 @@
 {
     "jumpTo1InstructionafterJump": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "0x6003565b6001600055",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "10000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "10000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "0x6003565b6001600055",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/jumpTo1InstructionafterJump_jumpdestFirstInstructionFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/jumpTo1InstructionafterJump_jumpdestFirstInstructionFiller.json
index 2e3ccffcb..0ece174eb 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/jumpTo1InstructionafterJump_jumpdestFirstInstructionFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/jumpTo1InstructionafterJump_jumpdestFirstInstructionFiller.json
@@ -1,29 +1,29 @@
 {
     "jumpTo1InstructionafterJump_jumpdestFirstInstruction": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "0x5b6003565b6001600055",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "10000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "10000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "0x5b6003565b6001600055",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/jumpTo1InstructionafterJump_noJumpDestFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/jumpTo1InstructionafterJump_noJumpDestFiller.json
index 4225715c1..403313876 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/jumpTo1InstructionafterJump_noJumpDestFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/jumpTo1InstructionafterJump_noJumpDestFiller.json
@@ -1,29 +1,29 @@
 {
     "jumpTo1InstructionafterJump_noJumpDest": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "0x6003566001600055",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "10000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "10000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "0x6003566001600055",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/jumpToUint64maxPlus1Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/jumpToUint64maxPlus1Filler.json
index 463bbed69..e4a49d87e 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/jumpToUint64maxPlus1Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/jumpToUint64maxPlus1Filler.json
@@ -1,36 +1,36 @@
 {
     "jumpToUint64maxPlus1": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x01" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x01": "0x00"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x6801000000000000000b565b5b6001600155",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6801000000000000000b565b5b6001600155",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/jumpToUintmaxPlus1Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/jumpToUintmaxPlus1Filler.json
index ecf7338a7..5fc20f381 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/jumpToUintmaxPlus1Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/jumpToUintmaxPlus1Filler.json
@@ -1,36 +1,36 @@
 {
     "jumpToUintmaxPlus1": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x01" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x01": "0x00"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x640100000007565b5b6001600155",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x640100000007565b5b6001600155",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/jumpdestBigListFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/jumpdestBigListFiller.json
index bd2a3868a..189d0df7c 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/jumpdestBigListFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/jumpdestBigListFiller.json
@@ -1,29 +1,29 @@
 {
     "jumpdestBigList": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x6009565b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6009565b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b5b",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/jumpi0Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/jumpi0Filler.json
index b0d052d7c..4d950b74b 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/jumpi0Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/jumpi0Filler.json
@@ -1,29 +1,29 @@
 {
     "jumpi0": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x602360016009576001600255",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x602360016009576001600255",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/jumpi1Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/jumpi1Filler.json
index dab246d49..e56ac24ac 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/jumpi1Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/jumpi1Filler.json
@@ -1,36 +1,36 @@
 {
     "jumpi1": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x02" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x02": "0x01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x602360006009576001600255",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x602360006009576001600255",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/jumpi1_jumpdestFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/jumpi1_jumpdestFiller.json
index 59c42cf54..c0f855bcf 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/jumpi1_jumpdestFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/jumpi1_jumpdestFiller.json
@@ -1,29 +1,29 @@
 {
     "jumpi1_jumpdest": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x60236001600a5760015b600255",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x60236001600a5760015b600255",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/jumpiAfterStopFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/jumpiAfterStopFiller.json
index e7ca884dc..1f724fcce 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/jumpiAfterStopFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/jumpiAfterStopFiller.json
@@ -1,36 +1,36 @@
 {
     "jumpiAfterStop": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x03" : "0x02"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x02"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x60016008570060015b6002600355",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x60016008570060015b6002600355",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/jumpiOutsideBoundaryFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/jumpiOutsideBoundaryFiller.json
index 651fe087c..45104626d 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/jumpiOutsideBoundaryFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/jumpiOutsideBoundaryFiller.json
@@ -1,29 +1,29 @@
 {
     "jumpiOutsideBoundary": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x60017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff576002600355",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x60017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff576002600355",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/jumpiToUint64maxPlus1Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/jumpiToUint64maxPlus1Filler.json
index 570f2d6a4..a7f2d9933 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/jumpiToUint64maxPlus1Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/jumpiToUint64maxPlus1Filler.json
@@ -1,36 +1,36 @@
 {
     "jumpiToUint64maxPlus1": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x01" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x01": "0x00"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x60016801000000000000000d575b5b6001600155",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x60016801000000000000000d575b5b6001600155",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/jumpiToUintmaxPlus1Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/jumpiToUintmaxPlus1Filler.json
index dd2ac33d4..1c5d17b42 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/jumpiToUintmaxPlus1Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/jumpiToUintmaxPlus1Filler.json
@@ -1,36 +1,36 @@
 {
     "jumpiToUintmaxPlus1": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x01" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x01": "0x00"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x6001640100000009575b5b6001600155",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6001640100000009575b5b6001600155",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/jumpi_at_the_endFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/jumpi_at_the_endFiller.json
index 471d6f4bf..10df5d21e 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/jumpi_at_the_endFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/jumpi_at_the_endFiller.json
@@ -1,30 +1,30 @@
 {
-    "jumpi_at_the_end" : {
-        "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "256",
-            "currentGasLimit" : "10000000",
-            "currentNumber" : "0",
-            "currentTimestamp" : "1",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+    "jumpi_at_the_end": {
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-			"code" : "(asm 10 0 MSTORE JUMPDEST 0 MLOAD 1 SWAP1 SUB DUP1 0 MSTORE 6 JUMPI)",
-            "data" : "0x",
-            "gas" : "1000",
-            "gasPrice" : "100000000000000",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "code": "(asm 10 0 MSTORE JUMPDEST 0 MLOAD 1 SWAP1 SUB DUP1 0 MSTORE 6 JUMPI)",
+            "data": "0x",
+            "gas": "1000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-				"code" : "(asm 10 0 MSTORE JUMPDEST 0 MLOAD 1 SWAP1 SUB DUP1 0 MSTORE 5 JUMPI)",
-                "nonce" : "0",
-                "storage" : {}
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "(asm 10 0 MSTORE JUMPDEST 0 MLOAD 1 SWAP1 SUB DUP1 0 MSTORE 5 JUMPI)",
+                "nonce": "0",
+                "storage": {}
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/jumpifInsidePushWithJumpDestFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/jumpifInsidePushWithJumpDestFiller.json
index 3350020c7..9840f3676 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/jumpifInsidePushWithJumpDestFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/jumpifInsidePushWithJumpDestFiller.json
@@ -1,29 +1,29 @@
 {
     "jumpifInsidePushWithJumpDest": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x6001600657655b6001600155",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6001600657655b6001600155",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/jumpifInsidePushWithoutJumpDestFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/jumpifInsidePushWithoutJumpDestFiller.json
index b88e1ddc3..73c03088d 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/jumpifInsidePushWithoutJumpDestFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/jumpifInsidePushWithoutJumpDestFiller.json
@@ -1,29 +1,29 @@
 {
     "jumpifInsidePushWithoutJumpDest": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x600160075761eeff",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x600160075761eeff",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/kv1Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/kv1Filler.json
index 961516b45..e4f1c8471 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/kv1Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/kv1Filler.json
@@ -1,37 +1,36 @@
 {
     "kv1": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x45" : "0xcd1722f3947def4cf144679da39c4c32bdc35681"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x45": "0xcd1722f3947def4cf144679da39c4c32bdc35681"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "{    [[69]] (caller)   (return 0 (lll     (when (= (caller) @@69)       (def 'i 0x80)       (for {} (< @i (calldatasize)) [i](+ @i 64)         [[ (calldataload @i) ]] (calldataload (+ @i 32))       )     )   0))}",
-	    "code" : "0x33604555602d80600f6000396000f3604554331415602c575b366080511015602b576020608051013560805135556040608051016080526009565b5b",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x33604555602d80600f6000396000f3604554331415602c575b366080511015602b576020608051013560805135556040608051016080526009565b5b",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/log1MemExpFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/log1MemExpFiller.json
index 1f7bbe1ee..d47a0b664 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/log1MemExpFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/log1MemExpFiller.json
@@ -1,29 +1,29 @@
 {
     "log1MemExp": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "8390000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "8390000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x60ff60ff630fffffffa1",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "8390000000",
+            "gasPrice": "1",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "1",
-            "gas" : "8390000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x60ff60ff630fffffffa1",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/loop_stacklimit_1020Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/loop_stacklimit_1020Filler.json
index 881e0573c..2d0035389 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/loop_stacklimit_1020Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/loop_stacklimit_1020Filler.json
@@ -1,34 +1,34 @@
 {
     "loop_stacklimit_1020": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000"
-            }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1020"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "(asm 0 CALLVALUE JUMPDEST 1 SWAP1 SUB SWAP1 1 ADD DUP2 DUP1 3 JUMPI 0 MSTORE 1 MSTORE 0 MSIZE RETURN)",
-            "storage": {}
-        }
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000"
+            }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1020",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "(asm 0 CALLVALUE JUMPDEST 1 SWAP1 SUB SWAP1 1 ADD DUP2 DUP1 3 JUMPI 0 MSTORE 1 MSTORE 0 MSIZE RETURN)",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/loop_stacklimit_1021Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/loop_stacklimit_1021Filler.json
index 8e11bb5ea..4fd9fbbfa 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/loop_stacklimit_1021Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/loop_stacklimit_1021Filler.json
@@ -1,35 +1,34 @@
 {
     "loop_stacklimit_1021": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                }
-            }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1021"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "(asm 0 CALLVALUE JUMPDEST 1 SWAP1 SUB SWAP1 1 ADD DUP2 DUP1 3 JUMPI 0 MSTORE 1 MSTORE 0 MSIZE RETURN)",
-            "storage": {}
-        }
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {}
+            }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1021",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "(asm 0 CALLVALUE JUMPDEST 1 SWAP1 SUB SWAP1 1 ADD DUP2 DUP1 3 JUMPI 0 MSTORE 1 MSTORE 0 MSIZE RETURN)",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/memory1Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/memory1Filler.json
index f457cf0cf..79da50072 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/memory1Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/memory1Filler.json
@@ -1,29 +1,29 @@
 {
     "memory1": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "(asm 2 0 MSTORE8 3 1 MSTORE8 0 MLOAD 1 MLOAD ADD 2 MSTORE 64 0 RETURN)",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "(asm 2 0 MSTORE8 3 1 MSTORE8 0 MLOAD 1 MLOAD ADD 2 MSTORE 64 0 RETURN)",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/mloadError0Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/mloadError0Filler.json
index 78f9f4be7..9b1907199 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/mloadError0Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/mloadError0Filler.json
@@ -1,35 +1,34 @@
 {
     "mloadError0": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                }
-            }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "{[[ 0 ]] (MLOAD 0) } ",
-            "storage": {}
-        }
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {}
+            }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{[[ 0 ]] (MLOAD 0) } ",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/mloadError1Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/mloadError1Filler.json
index 5f88c7df2..830822a85 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/mloadError1Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/mloadError1Filler.json
@@ -1,35 +1,34 @@
 {
     "mloadError1": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                }
-            }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "{(MSTORE 1 23) [[ 1 ]] (MLOAD 0) } ",
-            "storage": {}
-        }
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {}
+            }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{(MSTORE 1 23) [[ 1 ]] (MLOAD 0) } ",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/mloadMemExpFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/mloadMemExpFiller.json
index 79de9e9e2..58d7b5b6f 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/mloadMemExpFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/mloadMemExpFiller.json
@@ -1,29 +1,29 @@
 {
     "mloadMemExp": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "8390000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "8390000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x630fffffff51",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "8390000",
+            "gasPrice": "1",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "1",
-            "gas" : "8390000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x630fffffff51",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/mloadOutOfGasError2Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/mloadOutOfGasError2Filler.json
index 8fb9ea7b7..46a7776fc 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/mloadOutOfGasError2Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/mloadOutOfGasError2Filler.json
@@ -1,29 +1,29 @@
 {
     "mloadOutOfGasError2": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 1 ]] (MLOAD 7489573) } ",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ [[ 1 ]] (MLOAD 7489573) } ",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/msize0Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/msize0Filler.json
index df6f371ad..d3e8daea2 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/msize0Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/msize0Filler.json
@@ -1,36 +1,36 @@
 {
     "msize0": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x" : "0x20"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x20"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "{(MSTORE 0 0xff) [[ 0 ]] (MSIZE)}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{(MSTORE 0 0xff) [[ 0 ]] (MSIZE)}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/msize1Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/msize1Filler.json
index 4ddff67e4..334db6f5e 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/msize1Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/msize1Filler.json
@@ -1,36 +1,36 @@
 {
     "msize1": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x" : "0x20"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x20"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "{(MSTORE 0 0xffffffffff) [[ 0 ]] (MSIZE)}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{(MSTORE 0 0xffffffffff) [[ 0 ]] (MSIZE)}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/msize2Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/msize2Filler.json
index 90adb0ff0..a14dc42fa 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/msize2Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/msize2Filler.json
@@ -1,36 +1,36 @@
 {
     "msize2": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x" : "0x40"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x40"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "{(MSTORE 0 0xffffffffff)  (MSTORE 32 0xeeee) [[ 0 ]] (MSIZE)}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{(MSTORE 0 0xffffffffff)  (MSTORE 32 0xeeee) [[ 0 ]] (MSIZE)}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/msize3Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/msize3Filler.json
index 0145a560e..50b38b6cd 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/msize3Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/msize3Filler.json
@@ -1,36 +1,36 @@
 {
     "msize3": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x" : "0x80"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x80"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "{(MSTORE 0 0xffffffffff)  (MSTORE 90 0xeeee) [[ 0 ]] (MSIZE)}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{(MSTORE 0 0xffffffffff)  (MSTORE 90 0xeeee) [[ 0 ]] (MSIZE)}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/mstore0Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/mstore0Filler.json
index 4dcee1db0..5f29c3ce5 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/mstore0Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/mstore0Filler.json
@@ -1,36 +1,36 @@
 {
     "mstore0": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x01" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x01": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ (MSTORE 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 1 ]] (MLOAD 1) } ",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ (MSTORE 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 1 ]] (MLOAD 1) } ",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/mstore1Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/mstore1Filler.json
index 8232e0b5d..00fafb981 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/mstore1Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/mstore1Filler.json
@@ -1,36 +1,36 @@
 {
     "mstore1": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x01" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x01": "0x01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ (MSTORE 1 (+ 2 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) ) [[ 1 ]] (MLOAD 1) } ",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ (MSTORE 1 (+ 2 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) ) [[ 1 ]] (MLOAD 1) } ",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/mstore8MemExpFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/mstore8MemExpFiller.json
index 6b9c62d72..f726ab91f 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/mstore8MemExpFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/mstore8MemExpFiller.json
@@ -1,29 +1,29 @@
 {
     "mstore8MemExp": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "8390000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "8390000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x60f1630fffffff53",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "8390000",
+            "gasPrice": "1",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "1",
-            "gas" : "8390000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x60f1630fffffff53",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/mstore8WordToBigErrorFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/mstore8WordToBigErrorFiller.json
index 0bfffec09..5b8c3a080 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/mstore8WordToBigErrorFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/mstore8WordToBigErrorFiller.json
@@ -1,36 +1,36 @@
 {
     "mstore8WordToBigError": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-			"0x01" : "0xff00000000000000000000000000000000000000000000000000000000000000"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x01": "0xff00000000000000000000000000000000000000000000000000000000000000"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ (MSTORE8 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 1 ]] (MLOAD 1) } ",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ (MSTORE8 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) [[ 1 ]] (MLOAD 1) } ",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/mstore8_0Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/mstore8_0Filler.json
index 4e35bce85..2055f8e25 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/mstore8_0Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/mstore8_0Filler.json
@@ -1,36 +1,36 @@
 {
     "mstore8_0": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x01" : "0xff00000000000000000000000000000000000000000000000000000000000000"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x01": "0xff00000000000000000000000000000000000000000000000000000000000000"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ (MSTORE8 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff ) [[ 1 ]] (MLOAD 1) } ",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ (MSTORE8 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff ) [[ 1 ]] (MLOAD 1) } ",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/mstore8_1Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/mstore8_1Filler.json
index c2359f625..891394696 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/mstore8_1Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/mstore8_1Filler.json
@@ -1,39 +1,39 @@
 {
     "mstore8_1": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "code" : "0x60ff60015360ee600253600051600155",
-                "nonce" : "0",
-                "storage" : {
-                    "0x01" : "0xffee0000000000000000000000000000000000000000000000000000000000"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x60ff60015360ee600253600051600155",
+                "nonce": "0",
+                "storage": {
+                    "0x01": "0xffee0000000000000000000000000000000000000000000000000000000000"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ (MSTORE8 1 0xff) (MSTORE8 2 0xee) [[ 1 ]] (MLOAD 0) } ",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ (MSTORE8 1 0xff) (MSTORE8 2 0xee) [[ 1 ]] (MLOAD 0) } ",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/mstoreMemExpFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/mstoreMemExpFiller.json
index d08710009..829890851 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/mstoreMemExpFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/mstoreMemExpFiller.json
@@ -1,29 +1,29 @@
 {
     "mstoreMemExp": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "8390000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "8390000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x60f1630fffffff52",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "8390000000",
+            "gasPrice": "1",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "1",
-            "gas" : "8390000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x60f1630fffffff52",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/mstoreWordToBigErrorFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/mstoreWordToBigErrorFiller.json
index 343717eb1..7cae4c4de 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/mstoreWordToBigErrorFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/mstoreWordToBigErrorFiller.json
@@ -1,36 +1,36 @@
 {
     "mstoreWordToBigError": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "8390000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "8390000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-			"0x01" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x01": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ (MSTORE 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff ) [[ 1 ]] (MLOAD 1) } ",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ (MSTORE 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff ) [[ 1 ]] (MLOAD 1) } ",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/mstore_mload0Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/mstore_mload0Filler.json
index adb73edd1..2253c3263 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/mstore_mload0Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/mstore_mload0Filler.json
@@ -1,36 +1,36 @@
 {
     "mstore_mload0": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x01" : "0x17"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x01": "0x17"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "{(MSTORE 0 23) [[ 1 ]] (MLOAD 0) } ",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{(MSTORE 0 23) [[ 1 ]] (MLOAD 0) } ",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/pc0Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/pc0Filler.json
index f836973e5..66f0e8ab4 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/pc0Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/pc0Filler.json
@@ -1,35 +1,34 @@
 {
     "pc0": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                }
-            }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (PC)}",
-            "storage": {}
-        }
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {}
+            }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ [[ 0 ]] (PC)}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/pc1Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/pc1Filler.json
index 3053c9f37..03af3eb66 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/pc1Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/pc1Filler.json
@@ -1,36 +1,36 @@
 {
     "pc1": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x" : "0x05"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x05"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "{(SSTORE 0 0xff) [[ 0 ]] (PC)}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{(SSTORE 0 0xff) [[ 0 ]] (PC)}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/pop0Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/pop0Filler.json
index 66f318b66..e7d707d48 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/pop0Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/pop0Filler.json
@@ -1,36 +1,36 @@
 {
     "pop0": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-	"expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x03" : "0x02"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x02"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x6002600360045055",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6002600360045055",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/pop1Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/pop1Filler.json
index 25933468e..14b42b3af 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/pop1Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/pop1Filler.json
@@ -1,29 +1,29 @@
 {
     "pop1": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x5060026003600455",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x5060026003600455",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/return1Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/return1Filler.json
index c8aa5fa7d..4ffec6a4e 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/return1Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/return1Filler.json
@@ -1,29 +1,29 @@
 {
     "return1": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "(asm 1 1000000 RETURN)",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "(asm 1 1000000 RETURN)",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/return2Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/return2Filler.json
index 72c86f433..c4f3d9cec 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/return2Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/return2Filler.json
@@ -1,29 +1,29 @@
 {
     "return2": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ (def 'i 0x80) [i] 1 ( if (> @i 0) { (return 39) [i] 2 } (return 1) ) }",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ (def 'i 0x80) [i] 1 ( if (> @i 0) { (return 39) [i] 2 } (return 1) ) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/sha3MemExpFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/sha3MemExpFiller.json
index 3686dfa40..b07a7a46b 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/sha3MemExpFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/sha3MemExpFiller.json
@@ -1,29 +1,29 @@
 {
     "sha3MemExp": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "8390000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "8390000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x60ff630fffffff20",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "8390000000",
+            "gasPrice": "1",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "1",
-            "gas" : "8390000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x60ff630fffffff20",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/sstore_load_0Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/sstore_load_0Filler.json
index 81a4dcade..5d81bbd61 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/sstore_load_0Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/sstore_load_0Filler.json
@@ -1,38 +1,38 @@
 {
     "sstore_load_0": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x" : "0xff",
-                    "0x0a" : "0xee",
-                    "0x14" : "0xff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xff",
+                    "0x0a": "0xee",
+                    "0x14": "0xff"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ (SSTORE 0 0xff) (SSTORE 10 0xee)  [[ 20 ]] (SLOAD 0)  } ",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ (SSTORE 0 0xff) (SSTORE 10 0xee)  [[ 20 ]] (SLOAD 0)  } ",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/sstore_load_1Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/sstore_load_1Filler.json
index 5e00a6937..24e9ce486 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/sstore_load_1Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/sstore_load_1Filler.json
@@ -1,37 +1,37 @@
 {
     "sstore_load_1": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x" : "0xff",
-                    "0x0a" : "0xee"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xff",
+                    "0x0a": "0xee"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ (SSTORE 0 0xff) (SSTORE 10 0xee)  [[ 20 ]] (SLOAD 100)  } ",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ (SSTORE 0 0xff) (SSTORE 10 0xee)  [[ 20 ]] (SLOAD 100)  } ",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/sstore_load_2Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/sstore_load_2Filler.json
index e95eb3189..f2826ed56 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/sstore_load_2Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/sstore_load_2Filler.json
@@ -1,29 +1,29 @@
 {
     "sstore_load_2": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ (SSTORE 0 0xff) (SSTORE 1 0xee) (SSTORE 2 0xdd) [[ 10 ]] (SLOAD 1) [[ 20 ]] (SLOAD 2)  } ",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ (SSTORE 0 0xff) (SSTORE 1 0xee) (SSTORE 2 0xdd) [[ 10 ]] (SLOAD 1) [[ 20 ]] (SLOAD 2)  } ",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/sstore_underflowFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/sstore_underflowFiller.json
index c73117b25..ffb53d0c7 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/sstore_underflowFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/sstore_underflowFiller.json
@@ -1,36 +1,36 @@
 {
     "sstore_underflow": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x01" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x01": "0x00"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x600155",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x600155",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/stack_loopFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/stack_loopFiller.json
index bab696265..9b17735ec 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/stack_loopFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/stack_loopFiller.json
@@ -1,30 +1,30 @@
 {
     "stack_loop": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "_code" : "(asm 10 JUMPDEST 1 DUP2 SUB DUP1 2 JUMPI   0 MSTORE8 1  MSTORE8 2  MSTORE8 3 MSTORE8 4 MSTORE8 5 MSTORE8 6 MSTORE8 7 MSTORE8 8 MSTORE8 9 MSTORE8 MSIZE 0 RETURN)",
-            "code" : "0x60015b6001810380600257600053600153600253600353600453600553600653600753600853600953596000f3",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "_code": "(asm 10 JUMPDEST 1 DUP2 SUB DUP1 2 JUMPI   0 MSTORE8 1  MSTORE8 2  MSTORE8 3 MSTORE8 4 MSTORE8 5 MSTORE8 6 MSTORE8 7 MSTORE8 8 MSTORE8 9 MSTORE8 MSIZE 0 RETURN)",
+                "balance": "100000000000000000000000",
+                "code": "0x60015b6001810380600257600053600153600253600353600453600553600653600753600853600953596000f3",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/stackjump1Filler.json b/src/VMTestsFiller/vmIOandFlowOperations/stackjump1Filler.json
index 118e848e7..3701ef651 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/stackjump1Filler.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/stackjump1Filler.json
@@ -1,29 +1,29 @@
 {
     "stackjump1": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "(asm 0x4 0x6 0x9 0x14 JUMP JUMPDEST 0xa SUB 0x0 MSTORE MSIZE 0x0 RETURN JUMPDEST 0x0 MSTORE ADD 0x9 JUMP)",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "(asm 0x4 0x6 0x9 0x14 JUMP JUMPDEST 0xa SUB 0x0 MSTORE MSIZE 0x0 RETURN JUMPDEST 0x0 MSTORE ADD 0x9 JUMP)",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/swapAt52becameMstoreFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/swapAt52becameMstoreFiller.json
index 5c30f638e..ca511da01 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/swapAt52becameMstoreFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/swapAt52becameMstoreFiller.json
@@ -1,29 +1,29 @@
 {
     "swapAt52becameMstore": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "0x600260035255",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x600260035255",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmIOandFlowOperations/whenFiller.json b/src/VMTestsFiller/vmIOandFlowOperations/whenFiller.json
index 8e4e2a34b..49cfdc62d 100644
--- a/src/VMTestsFiller/vmIOandFlowOperations/whenFiller.json
+++ b/src/VMTestsFiller/vmIOandFlowOperations/whenFiller.json
@@ -1,29 +1,29 @@
 {
     "when": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ (def 'i 0x80) (when (> 1 0) [i] 13) }",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ (def 'i 0x80) (when (> 1 0) [i] 13) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file