src/VMTestsFiller: formatting changes

609 files changed, 16199 insertions, 16281 deletions

diff --git a/src/VMTestsFiller/vmArithmeticTest/add0Filler.json b/src/VMTestsFiller/vmArithmeticTest/add0Filler.json
index db69bc7bb..9fd7b0536 100644
--- a/src/VMTestsFiller/vmArithmeticTest/add0Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/add0Filler.json
@@ -1,36 +1,36 @@
 {
     "add0": {
-        "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" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (+ 115792089237316195423570985008687907853269984665640564039457584007913129639935 115792089237316195423570985008687907853269984665640564039457584007913129639935) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (+ 115792089237316195423570985008687907853269984665640564039457584007913129639935 115792089237316195423570985008687907853269984665640564039457584007913129639935) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/add1Filler.json b/src/VMTestsFiller/vmArithmeticTest/add1Filler.json
index 633e1e5b6..f8d06161d 100644
--- a/src/VMTestsFiller/vmArithmeticTest/add1Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/add1Filler.json
@@ -1,36 +1,36 @@
 {
     "add1": {
-        "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" : "0x03"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x03"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (+ 115792089237316195423570985008687907853269984665640564039457584007913129639935 4) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (+ 115792089237316195423570985008687907853269984665640564039457584007913129639935 4) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/add2Filler.json b/src/VMTestsFiller/vmArithmeticTest/add2Filler.json
index 1dd938ad7..c1d9eb7db 100644
--- a/src/VMTestsFiller/vmArithmeticTest/add2Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/add2Filler.json
@@ -1,36 +1,36 @@
 {
     "add2": {
-        "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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (+ 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 1) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (+ 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 1) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/add3Filler.json b/src/VMTestsFiller/vmArithmeticTest/add3Filler.json
index 0abe878af..d38da4825 100644
--- a/src/VMTestsFiller/vmArithmeticTest/add3Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/add3Filler.json
@@ -1,36 +1,36 @@
 {
     "add3": {
-        "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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (+ 0 0) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (+ 0 0) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/add4Filler.json b/src/VMTestsFiller/vmArithmeticTest/add4Filler.json
index 9394bd83f..35d0e7d6c 100644
--- a/src/VMTestsFiller/vmArithmeticTest/add4Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/add4Filler.json
@@ -1,36 +1,36 @@
 {
     "add4": {
-        "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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (+ 1 115792089237316195423570985008687907853269984665640564039457584007913129639935) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (+ 1 115792089237316195423570985008687907853269984665640564039457584007913129639935) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/addmod0Filler.json b/src/VMTestsFiller/vmArithmeticTest/addmod0Filler.json
index 48941c9b0..0a65fd428 100644
--- a/src/VMTestsFiller/vmArithmeticTest/addmod0Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/addmod0Filler.json
@@ -1,36 +1,36 @@
 {
     "addmod0": {
-        "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" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (ADDMOD 1 2 2) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (ADDMOD 1 2 2) } ",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/addmod1Filler.json b/src/VMTestsFiller/vmArithmeticTest/addmod1Filler.json
index a41816f5d..5a2506467 100644
--- a/src/VMTestsFiller/vmArithmeticTest/addmod1Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/addmod1Filler.json
@@ -1,36 +1,36 @@
 {
     "addmod1": {
-        "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" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (ADDMOD (- 0 1) (- 0 2) 2) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (ADDMOD (- 0 1) (- 0 2) 2) } ",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/addmod1_overflow2Filler.json b/src/VMTestsFiller/vmArithmeticTest/addmod1_overflow2Filler.json
index 853ed523a..6577c47ba 100644
--- a/src/VMTestsFiller/vmArithmeticTest/addmod1_overflow2Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/addmod1_overflow2Filler.json
@@ -1,36 +1,36 @@
 {
     "addmod1_overflow2": {
-        "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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "10000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (ADDMOD (- 0 1) 0 5) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (ADDMOD (- 0 1) 0 5) } ",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "10000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/addmod1_overflow3Filler.json b/src/VMTestsFiller/vmArithmeticTest/addmod1_overflow3Filler.json
index 194d225ab..4802d6bd5 100644
--- a/src/VMTestsFiller/vmArithmeticTest/addmod1_overflow3Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/addmod1_overflow3Filler.json
@@ -1,29 +1,29 @@
 {
     "addmod1_overflow3": {
-        "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" : "{ [[ 0 ]] (ADDMOD (- 0 1) 1 5) } ",
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (ADDMOD (- 0 1) 1 5) } ",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/addmod1_overflow4Filler.json b/src/VMTestsFiller/vmArithmeticTest/addmod1_overflow4Filler.json
index 8f14df512..02585ad63 100644
--- a/src/VMTestsFiller/vmArithmeticTest/addmod1_overflow4Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/addmod1_overflow4Filler.json
@@ -1,29 +1,29 @@
 {
     "addmod1_overflow4": {
-        "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" : "{ [[ 0 ]] (ADDMOD (- 0 1) 2 5) } ",
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (ADDMOD (- 0 1) 2 5) } ",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/addmod1_overflowDiffFiller.json b/src/VMTestsFiller/vmArithmeticTest/addmod1_overflowDiffFiller.json
index 2b2747d14..3cd013ad3 100644
--- a/src/VMTestsFiller/vmArithmeticTest/addmod1_overflowDiffFiller.json
+++ b/src/VMTestsFiller/vmArithmeticTest/addmod1_overflowDiffFiller.json
@@ -1,29 +1,29 @@
 {
     "addmod1_overflowDiff": {
-        "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" : "{ [[ 0 ]] (ADDMOD (- 0 1) (- 0 2) 5) } ",
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (ADDMOD (- 0 1) (- 0 2) 5) } ",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/addmod2Filler.json b/src/VMTestsFiller/vmArithmeticTest/addmod2Filler.json
index 6c8d1d904..8f6fda76d 100644
--- a/src/VMTestsFiller/vmArithmeticTest/addmod2Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/addmod2Filler.json
@@ -1,36 +1,36 @@
 {
     "addmod2": {
-        "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": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x02"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (ADDMOD (- 0 6) 1 3) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (ADDMOD (- 0 6) 1 3) } ",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/addmod2_0Filler.json b/src/VMTestsFiller/vmArithmeticTest/addmod2_0Filler.json
index 5a2aec4af..a565e3190 100644
--- a/src/VMTestsFiller/vmArithmeticTest/addmod2_0Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/addmod2_0Filler.json
@@ -1,36 +1,36 @@
 {
     "addmod2_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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (EQ (SMOD (- 0 5) 3) (ADDMOD (- 0 6) 1 3) ) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EQ (SMOD (- 0 5) 3) (ADDMOD (- 0 6) 1 3) ) } ",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/addmod2_1Filler.json b/src/VMTestsFiller/vmArithmeticTest/addmod2_1Filler.json
index ea2dcd167..048524095 100644
--- a/src/VMTestsFiller/vmArithmeticTest/addmod2_1Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/addmod2_1Filler.json
@@ -1,36 +1,36 @@
 {
     "addmod2_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" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "{[[ 0 ]] (EQ (MOD (- 0 5) 3) (ADDMOD (- 0 6) 1 3) ) }",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{[[ 0 ]] (EQ (MOD (- 0 5) 3) (ADDMOD (- 0 6) 1 3) ) }",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/addmod3Filler.json b/src/VMTestsFiller/vmArithmeticTest/addmod3Filler.json
index 262407c9f..1ec82a61f 100644
--- a/src/VMTestsFiller/vmArithmeticTest/addmod3Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/addmod3Filler.json
@@ -1,36 +1,36 @@
 {
     "addmod3": {
-        "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": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x05"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (ADDMOD 4 1 (- 0 3) )} ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (ADDMOD 4 1 (- 0 3) )} ",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/addmod3_0Filler.json b/src/VMTestsFiller/vmArithmeticTest/addmod3_0Filler.json
index 529a316b1..0e0e2b322 100644
--- a/src/VMTestsFiller/vmArithmeticTest/addmod3_0Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/addmod3_0Filler.json
@@ -1,36 +1,36 @@
 {
     "addmod3_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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (EQ (ADDMOD 4 1 (- 0 3) ) 2 ) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EQ (ADDMOD 4 1 (- 0 3) ) 2 ) } ",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/addmodBigIntCastFiller.json b/src/VMTestsFiller/vmArithmeticTest/addmodBigIntCastFiller.json
index 125283b4d..9bd86d0ed 100644
--- a/src/VMTestsFiller/vmArithmeticTest/addmodBigIntCastFiller.json
+++ b/src/VMTestsFiller/vmArithmeticTest/addmodBigIntCastFiller.json
@@ -1,36 +1,36 @@
 {
     "addmodBigIntCast": {
-        "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" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (ADDMOD 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 1 5) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (ADDMOD 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 1 5) } ",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/addmodDivByZero1Filler.json b/src/VMTestsFiller/vmArithmeticTest/addmodDivByZero1Filler.json
index 1006af6be..63d536e0a 100644
--- a/src/VMTestsFiller/vmArithmeticTest/addmodDivByZero1Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/addmodDivByZero1Filler.json
@@ -1,36 +1,36 @@
 {
     "addmodDivByZero1": {
-        "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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (ADDMOD 0 1 0) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (ADDMOD 0 1 0) } ",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/addmodDivByZero2Filler.json b/src/VMTestsFiller/vmArithmeticTest/addmodDivByZero2Filler.json
index 640d16556..7a542f79f 100644
--- a/src/VMTestsFiller/vmArithmeticTest/addmodDivByZero2Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/addmodDivByZero2Filler.json
@@ -1,36 +1,36 @@
 {
     "addmodDivByZero2": {
-        "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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (ADDMOD 1 0 0) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (ADDMOD 1 0 0) } ",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/addmodDivByZero3Filler.json b/src/VMTestsFiller/vmArithmeticTest/addmodDivByZero3Filler.json
index 10444e450..07e4995a9 100644
--- a/src/VMTestsFiller/vmArithmeticTest/addmodDivByZero3Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/addmodDivByZero3Filler.json
@@ -1,29 +1,29 @@
 {
     "addmodDivByZero3": {
-        "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" : "{ [[ 0 ]] (- (ADDMOD 0 0 0) 1) } ",
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (- (ADDMOD 0 0 0) 1) } ",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/addmodDivByZeroFiller.json b/src/VMTestsFiller/vmArithmeticTest/addmodDivByZeroFiller.json
index 6c59695ed..5ae1552ce 100644
--- a/src/VMTestsFiller/vmArithmeticTest/addmodDivByZeroFiller.json
+++ b/src/VMTestsFiller/vmArithmeticTest/addmodDivByZeroFiller.json
@@ -1,36 +1,36 @@
 {
     "addmodDivByZero": {
-        "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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (ADDMOD 4 1 0) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (ADDMOD 4 1 0) } ",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/arith1Filler.json b/src/VMTestsFiller/vmArithmeticTest/arith1Filler.json
index d6a1c788f..10891d457 100644
--- a/src/VMTestsFiller/vmArithmeticTest/arith1Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/arith1Filler.json
@@ -1,35 +1,34 @@
 {
     "arith1": {
-        "env" : {
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-            "currentNumber" : "0",
-            "currentGasLimit" : "10000000",
-            "currentDifficulty" : "256",
-            "currentTimestamp" : "1",
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                }
-            }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "(asm 1 1 SWAP1 ADD 7 MUL 5 ADD 2 SWAP1 DIV 4 SWAP1 1 33 SWAP1 SDIV 21 ADD 3 MUL 5 SWAP1 SMOD 3 SUB 9 17 EXP 0 MSTORE 8 0 RETURN)",
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
                 "storage": {}
             }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "(asm 1 1 SWAP1 ADD 7 MUL 5 ADD 2 SWAP1 DIV 4 SWAP1 1 33 SWAP1 SDIV 21 ADD 3 MUL 5 SWAP1 SMOD 3 SUB 9 17 EXP 0 MSTORE 8 0 RETURN)",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/div1Filler.json b/src/VMTestsFiller/vmArithmeticTest/div1Filler.json
index 077f7a11b..843f496c1 100644
--- a/src/VMTestsFiller/vmArithmeticTest/div1Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/div1Filler.json
@@ -1,36 +1,36 @@
 {
     "div1": {
-        "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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "(asm 0x2 0xfedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210 DIV 0 MSTORE 32 0 RETURN)",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "(asm 0x2 0xfedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210 DIV 0 MSTORE 32 0 RETURN)",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/divBoostBugFiller.json b/src/VMTestsFiller/vmArithmeticTest/divBoostBugFiller.json
index beb04571e..1cb86b7d1 100644
--- a/src/VMTestsFiller/vmArithmeticTest/divBoostBugFiller.json
+++ b/src/VMTestsFiller/vmArithmeticTest/divBoostBugFiller.json
@@ -1,36 +1,36 @@
 {
     "divBoostBug": {
-        "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" : "0x89"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x89"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (/ 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFBA 0x1DAE6076B981DAE6076B981DAE6076B981DAE6076B981DAE6076B981DAE6077) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (/ 0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFBA 0x1DAE6076B981DAE6076B981DAE6076B981DAE6076B981DAE6076B981DAE6077) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/divByNonZero0Filler.json b/src/VMTestsFiller/vmArithmeticTest/divByNonZero0Filler.json
index f7f16206a..910162d93 100644
--- a/src/VMTestsFiller/vmArithmeticTest/divByNonZero0Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/divByNonZero0Filler.json
@@ -1,36 +1,36 @@
 {
     "divByNonZero0": {
-        "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": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x02"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (/ 5 2) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (/ 5 2) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/divByNonZero1Filler.json b/src/VMTestsFiller/vmArithmeticTest/divByNonZero1Filler.json
index 18a5da65f..c199f8100 100644
--- a/src/VMTestsFiller/vmArithmeticTest/divByNonZero1Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/divByNonZero1Filler.json
@@ -1,36 +1,36 @@
 {
     "divByNonZero1": {
-        "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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (/ 23 24) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (/ 23 24) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/divByNonZero2Filler.json b/src/VMTestsFiller/vmArithmeticTest/divByNonZero2Filler.json
index fc12dfba5..25917f01a 100644
--- a/src/VMTestsFiller/vmArithmeticTest/divByNonZero2Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/divByNonZero2Filler.json
@@ -1,36 +1,36 @@
 {
     "divByNonZero2": {
-        "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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (/ 0 24) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (/ 0 24) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/divByNonZero3Filler.json b/src/VMTestsFiller/vmArithmeticTest/divByNonZero3Filler.json
index c419dedf3..f76d2ed31 100644
--- a/src/VMTestsFiller/vmArithmeticTest/divByNonZero3Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/divByNonZero3Filler.json
@@ -1,36 +1,36 @@
 {
     "divByNonZero3": {
-        "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" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (/ 1 1) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (/ 1 1) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/divByZeroFiller.json b/src/VMTestsFiller/vmArithmeticTest/divByZeroFiller.json
index 41b3fb1eb..be50ece9e 100644
--- a/src/VMTestsFiller/vmArithmeticTest/divByZeroFiller.json
+++ b/src/VMTestsFiller/vmArithmeticTest/divByZeroFiller.json
@@ -1,36 +1,36 @@
 {
     "divByZero": {
-        "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" : "0x0000000000000000000000000000000000000000000000000000000000000000"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x0000000000000000000000000000000000000000000000000000000000000000"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (/ 2 0) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (/ 2 0) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/divByZero_2Filler.json b/src/VMTestsFiller/vmArithmeticTest/divByZero_2Filler.json
index 3d87f5fb9..24168a27c 100644
--- a/src/VMTestsFiller/vmArithmeticTest/divByZero_2Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/divByZero_2Filler.json
@@ -1,36 +1,36 @@
 {
     "divByZero_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"
         },
-	"expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-		     "0x" : "0x0000000000000000000000000000000000000000000000000000000000000007"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x0000000000000000000000000000000000000000000000000000000000000007"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (+ (/ 13 0) 7)}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (+ (/ 13 0) 7)}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/exp0Filler.json b/src/VMTestsFiller/vmArithmeticTest/exp0Filler.json
index b3a971a11..a3b26bc5a 100644
--- a/src/VMTestsFiller/vmArithmeticTest/exp0Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/exp0Filler.json
@@ -1,36 +1,36 @@
 {
     "exp0": {
-        "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" : "0x04"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x04"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 2 2)}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 2 2)}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/exp1Filler.json b/src/VMTestsFiller/vmArithmeticTest/exp1Filler.json
index 729cfa066..823d11c2c 100644
--- a/src/VMTestsFiller/vmArithmeticTest/exp1Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/exp1Filler.json
@@ -1,36 +1,36 @@
 {
     "exp1": {
-        "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" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 115792089237316195423570985008687907853269984665640564039457584007913129639935 115792089237316195423570985008687907853269984665640564039457584007913129639934 )}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 115792089237316195423570985008687907853269984665640564039457584007913129639935 115792089237316195423570985008687907853269984665640564039457584007913129639934 )}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/exp2Filler.json b/src/VMTestsFiller/vmArithmeticTest/exp2Filler.json
index e5ab694ad..81b0651af 100644
--- a/src/VMTestsFiller/vmArithmeticTest/exp2Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/exp2Filler.json
@@ -1,36 +1,36 @@
 {
     "exp2": {
-        "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" : "0xbc8cccccccc888888880000000aaaaaab00000000fffffffffffffff7fffffff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xbc8cccccccc888888880000000aaaaaab00000000fffffffffffffff7fffffff"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 2147483647 2147483647)}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 2147483647 2147483647)}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/exp3Filler.json b/src/VMTestsFiller/vmArithmeticTest/exp3Filler.json
index c2d1679ab..3d2f49d9d 100644
--- a/src/VMTestsFiller/vmArithmeticTest/exp3Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/exp3Filler.json
@@ -1,36 +1,36 @@
 {
     "exp3": {
-        "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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 0 2147483647)}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 0 2147483647)}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/exp4Filler.json b/src/VMTestsFiller/vmArithmeticTest/exp4Filler.json
index 42284f772..950f95821 100644
--- a/src/VMTestsFiller/vmArithmeticTest/exp4Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/exp4Filler.json
@@ -1,36 +1,36 @@
 {
     "exp4": {
-        "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" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 2147483647 0)}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 2147483647 0)}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/exp5Filler.json b/src/VMTestsFiller/vmArithmeticTest/exp5Filler.json
index 0ffe0b14b..20e368afd 100644
--- a/src/VMTestsFiller/vmArithmeticTest/exp5Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/exp5Filler.json
@@ -1,36 +1,36 @@
 {
     "exp5": {
-        "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" : "0x0101"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x0101"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 257 1)}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 257 1)}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/exp6Filler.json b/src/VMTestsFiller/vmArithmeticTest/exp6Filler.json
index 9b0c74a0f..301ed5bdd 100644
--- a/src/VMTestsFiller/vmArithmeticTest/exp6Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/exp6Filler.json
@@ -1,36 +1,36 @@
 {
     "exp6": {
-        "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" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 1 257)}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 1 257)}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/exp7Filler.json b/src/VMTestsFiller/vmArithmeticTest/exp7Filler.json
index f168ec8a8..0016a3aee 100644
--- a/src/VMTestsFiller/vmArithmeticTest/exp7Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/exp7Filler.json
@@ -1,36 +1,36 @@
 {
     "exp7": {
-        "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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 2 257)}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 2 257)}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/exp8Filler.json b/src/VMTestsFiller/vmArithmeticTest/exp8Filler.json
index 247291289..57816c90b 100644
--- a/src/VMTestsFiller/vmArithmeticTest/exp8Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/exp8Filler.json
@@ -1,36 +1,36 @@
 {
     "exp8": {
-        "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" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 0 0)}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 0 0)}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_0Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_0Filler.json
index d307b49a7..96e2b0ec6 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_0Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_0Filler.json
@@ -1,44 +1,44 @@
 {
     "expPowerOf256Of256_0": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "10000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x" : "0x0100",
-                    "0x01" : "0x0100",
-                    "0x02" : "0x0100",
-                    "0x03" : "0xff",
-                    "0x04" : "0xff",
-                    "0x05" : "0xff",
-                    "0x06" : "0x0101",
-                    "0x07" : "0x0101",
-                    "0x08" : "0x0101"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x0100",
+                    "0x01": "0x0100",
+                    "0x02": "0x0100",
+                    "0x03": "0xff",
+                    "0x04": "0xff",
+                    "0x05": "0xff",
+                    "0x06": "0x0101",
+                    "0x07": "0x0101",
+                    "0x08": "0x0101"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 (EXP 256 0)) [[ 1 ]] (EXP 256 (EXP 255 0)) [[ 2 ]] (EXP 256 (EXP 257 0)) [[ 3 ]] (EXP 255 (EXP 256 0)) [[ 4 ]] (EXP 255 (EXP 255 0)) [[ 5 ]] (EXP 255 (EXP 257 0)) [[ 6 ]] (EXP 257 (EXP 256 0)) [[ 7 ]] (EXP 257 (EXP 255 0)) [[ 8 ]] (EXP 257 (EXP 257 0)) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 (EXP 256 0)) [[ 1 ]] (EXP 256 (EXP 255 0)) [[ 2 ]] (EXP 256 (EXP 257 0)) [[ 3 ]] (EXP 255 (EXP 256 0)) [[ 4 ]] (EXP 255 (EXP 255 0)) [[ 5 ]] (EXP 255 (EXP 257 0)) [[ 6 ]] (EXP 257 (EXP 256 0)) [[ 7 ]] (EXP 257 (EXP 255 0)) [[ 8 ]] (EXP 257 (EXP 257 0)) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_10Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_10Filler.json
index 65f8f9cd5..ff5d8424b 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_10Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_10Filler.json
@@ -1,41 +1,41 @@
 {
     "expPowerOf256Of256_10": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "10000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x03" : "0xfe0f60957dc223578a0298879ec55c33085514ff7f0000000000000000000001",
-                    "0x04" : "0xc1ea45f348b5d351c4d8fe5c77da979cadc33d866acc42e981278896b1f600ff",
-                    "0x05" : "0x56ddb29bca94fb986ac0a40188b3b53f3216b3559bd8324a77ea8bd8a80a00ff",
-                    "0x06" : "0x2d49ff6b0bbe177ae9317000b68fb921f7aa6aff810000000000000000000001",
-                    "0x07" : "0x185fa9eab94cfe3016b69657e83b23fd24cc6960218254231c3db627a7f60101",
-                    "0x08" : "0xa7a0223829f26d6c635368034320563df4aa5eb62efc87a42bb35f69b20a0101"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0xfe0f60957dc223578a0298879ec55c33085514ff7f0000000000000000000001",
+                    "0x04": "0xc1ea45f348b5d351c4d8fe5c77da979cadc33d866acc42e981278896b1f600ff",
+                    "0x05": "0x56ddb29bca94fb986ac0a40188b3b53f3216b3559bd8324a77ea8bd8a80a00ff",
+                    "0x06": "0x2d49ff6b0bbe177ae9317000b68fb921f7aa6aff810000000000000000000001",
+                    "0x07": "0x185fa9eab94cfe3016b69657e83b23fd24cc6960218254231c3db627a7f60101",
+                    "0x08": "0xa7a0223829f26d6c635368034320563df4aa5eb62efc87a42bb35f69b20a0101"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 (EXP 256 10)) [[ 1 ]] (EXP 256 (EXP 255 10)) [[ 2 ]] (EXP 256 (EXP 257 10)) [[ 3 ]] (EXP 255 (EXP 256 10)) [[ 4 ]] (EXP 255 (EXP 255 10)) [[ 5 ]] (EXP 255 (EXP 257 10)) [[ 6 ]] (EXP 257 (EXP 256 10)) [[ 7 ]] (EXP 257 (EXP 255 10)) [[ 8 ]] (EXP 257 (EXP 257 10)) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 (EXP 256 10)) [[ 1 ]] (EXP 256 (EXP 255 10)) [[ 2 ]] (EXP 256 (EXP 257 10)) [[ 3 ]] (EXP 255 (EXP 256 10)) [[ 4 ]] (EXP 255 (EXP 255 10)) [[ 5 ]] (EXP 255 (EXP 257 10)) [[ 6 ]] (EXP 257 (EXP 256 10)) [[ 7 ]] (EXP 257 (EXP 255 10)) [[ 8 ]] (EXP 257 (EXP 257 10)) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_11Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_11Filler.json
index ce33249b4..fa50fbdd4 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_11Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_11Filler.json
@@ -1,41 +1,41 @@
 {
     "expPowerOf256Of256_11": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "10000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x03" : "0xe1440264b8ee0cea0218879ec55c33085514ff7f000000000000000000000001",
-                    "0x04" : "0x29575fdce377b23043e489e358581474bc863187fa85f9945473a2be5889feff",
-                    "0x05" : "0x3df8c030ec521fb109c4d887dbbc14c7c9c9921b27058e3503971b60b18b00ff",
-                    "0x06" : "0x67799740340daf4a30f000b68fb921f7aa6aff81000000000000000000000001",
-                    "0x07" : "0x540a4e4635b40585e09ff10b63ffe310dd717fca5c0a51570091e25e378bff01",
-                    "0x08" : "0xdbbaef5c49ffee61b08cde6ebc8dba6e9a62d56c2355d1980cb9e790bc8b0101"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0xe1440264b8ee0cea0218879ec55c33085514ff7f000000000000000000000001",
+                    "0x04": "0x29575fdce377b23043e489e358581474bc863187fa85f9945473a2be5889feff",
+                    "0x05": "0x3df8c030ec521fb109c4d887dbbc14c7c9c9921b27058e3503971b60b18b00ff",
+                    "0x06": "0x67799740340daf4a30f000b68fb921f7aa6aff81000000000000000000000001",
+                    "0x07": "0x540a4e4635b40585e09ff10b63ffe310dd717fca5c0a51570091e25e378bff01",
+                    "0x08": "0xdbbaef5c49ffee61b08cde6ebc8dba6e9a62d56c2355d1980cb9e790bc8b0101"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 (EXP 256 11)) [[ 1 ]] (EXP 256 (EXP 255 11)) [[ 2 ]] (EXP 256 (EXP 257 11)) [[ 3 ]] (EXP 255 (EXP 256 11)) [[ 4 ]] (EXP 255 (EXP 255 11)) [[ 5 ]] (EXP 255 (EXP 257 11)) [[ 6 ]] (EXP 257 (EXP 256 11)) [[ 7 ]] (EXP 257 (EXP 255 11)) [[ 8 ]] (EXP 257 (EXP 257 11)) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 (EXP 256 11)) [[ 1 ]] (EXP 256 (EXP 255 11)) [[ 2 ]] (EXP 256 (EXP 257 11)) [[ 3 ]] (EXP 255 (EXP 256 11)) [[ 4 ]] (EXP 255 (EXP 255 11)) [[ 5 ]] (EXP 255 (EXP 257 11)) [[ 6 ]] (EXP 257 (EXP 256 11)) [[ 7 ]] (EXP 257 (EXP 255 11)) [[ 8 ]] (EXP 257 (EXP 257 11)) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_12Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_12Filler.json
index 1c1b6727d..4e974ce56 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_12Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_12Filler.json
@@ -1,41 +1,41 @@
 {
     "expPowerOf256Of256_12": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "10000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x03" : "0xb0e95b83a36ce98218879ec55c33085514ff7f00000000000000000000000001",
-                    "0x04" : "0xc482ab56ec19186dc48c88f30861a850b2253b1ea6dc021589e569bd47f400ff",
-                    "0x05" : "0xcf45c7f9af4bbe4a83055b55b97777ad5e0a3f08b129c9ae208c5d713c0c00ff",
-                    "0x06" : "0xa5cbb62a421049b0f000b68fb921f7aa6aff8100000000000000000000000001",
-                    "0x07" : "0x3bde6ca66dffe1bf5d727c3edea74c7a4af43b3912e6256d37705c8f3bf40101",
-                    "0x08" : "0x3f49a1e40c5213aa4ffed57eb4c1ad2d181b2aaa289e9d59c2256c43480c0101"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0xb0e95b83a36ce98218879ec55c33085514ff7f00000000000000000000000001",
+                    "0x04": "0xc482ab56ec19186dc48c88f30861a850b2253b1ea6dc021589e569bd47f400ff",
+                    "0x05": "0xcf45c7f9af4bbe4a83055b55b97777ad5e0a3f08b129c9ae208c5d713c0c00ff",
+                    "0x06": "0xa5cbb62a421049b0f000b68fb921f7aa6aff8100000000000000000000000001",
+                    "0x07": "0x3bde6ca66dffe1bf5d727c3edea74c7a4af43b3912e6256d37705c8f3bf40101",
+                    "0x08": "0x3f49a1e40c5213aa4ffed57eb4c1ad2d181b2aaa289e9d59c2256c43480c0101"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 (EXP 256 12)) [[ 1 ]] (EXP 256 (EXP 255 12)) [[ 2 ]] (EXP 256 (EXP 257 12)) [[ 3 ]] (EXP 255 (EXP 256 12)) [[ 4 ]] (EXP 255 (EXP 255 12)) [[ 5 ]] (EXP 255 (EXP 257 12)) [[ 6 ]] (EXP 257 (EXP 256 12)) [[ 7 ]] (EXP 257 (EXP 255 12)) [[ 8 ]] (EXP 257 (EXP 257 12)) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 (EXP 256 12)) [[ 1 ]] (EXP 256 (EXP 255 12)) [[ 2 ]] (EXP 256 (EXP 257 12)) [[ 3 ]] (EXP 255 (EXP 256 12)) [[ 4 ]] (EXP 255 (EXP 255 12)) [[ 5 ]] (EXP 255 (EXP 257 12)) [[ 6 ]] (EXP 257 (EXP 256 12)) [[ 7 ]] (EXP 257 (EXP 255 12)) [[ 8 ]] (EXP 257 (EXP 257 12)) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_13Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_13Filler.json
index 89de4130b..53c25abb1 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_13Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_13Filler.json
@@ -1,41 +1,41 @@
 {
     "expPowerOf256Of256_13": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "10000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x03" : "0xe02639036c698218879ec55c33085514ff7f0000000000000000000000000001",
-                    "0x04" : "0x8be664bde946d939ce551b948b503787942d2a7734509288c1b62fd5c48bfeff",
-                    "0x05" : "0xa923a28e7a75aef26c51580ffc686879e4a0b404b089bdbcd751d88b478d00ff",
-                    "0x06" : "0x41ac5ea30fc9b0f000b68fb921f7aa6aff810000000000000000000000000001",
-                    "0x07" : "0x0daa3a177ec975cb69bb4acf4a6e1be7bcc1ad33d1ffad97510f9fea9d8dff01",
-                    "0x08" : "0x19e6822beb889be28310060f4fb9741bfd50a31fa81ec65de21f7b02548d0101"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0xe02639036c698218879ec55c33085514ff7f0000000000000000000000000001",
+                    "0x04": "0x8be664bde946d939ce551b948b503787942d2a7734509288c1b62fd5c48bfeff",
+                    "0x05": "0xa923a28e7a75aef26c51580ffc686879e4a0b404b089bdbcd751d88b478d00ff",
+                    "0x06": "0x41ac5ea30fc9b0f000b68fb921f7aa6aff810000000000000000000000000001",
+                    "0x07": "0x0daa3a177ec975cb69bb4acf4a6e1be7bcc1ad33d1ffad97510f9fea9d8dff01",
+                    "0x08": "0x19e6822beb889be28310060f4fb9741bfd50a31fa81ec65de21f7b02548d0101"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 (EXP 256 13)) [[ 1 ]] (EXP 256 (EXP 255 13)) [[ 2 ]] (EXP 256 (EXP 257 13)) [[ 3 ]] (EXP 255 (EXP 256 13)) [[ 4 ]] (EXP 255 (EXP 255 13)) [[ 5 ]] (EXP 255 (EXP 257 13)) [[ 6 ]] (EXP 257 (EXP 256 13)) [[ 7 ]] (EXP 257 (EXP 255 13)) [[ 8 ]] (EXP 257 (EXP 257 13)) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 (EXP 256 13)) [[ 1 ]] (EXP 256 (EXP 255 13)) [[ 2 ]] (EXP 256 (EXP 257 13)) [[ 3 ]] (EXP 255 (EXP 256 13)) [[ 4 ]] (EXP 255 (EXP 255 13)) [[ 5 ]] (EXP 255 (EXP 257 13)) [[ 6 ]] (EXP 257 (EXP 256 13)) [[ 7 ]] (EXP 257 (EXP 255 13)) [[ 8 ]] (EXP 257 (EXP 257 13)) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_14Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_14Filler.json
index 4011d7900..ffa19d20b 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_14Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_14Filler.json
@@ -1,41 +1,41 @@
 {
     "expPowerOf256Of256_14": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "10000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x03" : "0xdb9902ec698218879ec55c33085514ff7f000000000000000000000000000001",
-                    "0x04" : "0x83fab06c6c8fef761ebbb9534c06ac2a9d61820623008069062ff3b1e1f200ff",
-                    "0x05" : "0x3f791dd183ed5b963bd86e0dba1a9dd5b8ceeb078f15c73062f1942fd40e00ff",
-                    "0x06" : "0xe0bfa28fc9b0f000b68fb921f7aa6aff81000000000000000000000000000001",
-                    "0x07" : "0x8133b760dfae27560eb490f235ddfa301f058dee4f01f3fe4b3567d0d3f20101",
-                    "0x08" : "0xcd4cd0124e983af71620fb5f98275965c6a8bebc4b8adc288b63224ee20e0101"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0xdb9902ec698218879ec55c33085514ff7f000000000000000000000000000001",
+                    "0x04": "0x83fab06c6c8fef761ebbb9534c06ac2a9d61820623008069062ff3b1e1f200ff",
+                    "0x05": "0x3f791dd183ed5b963bd86e0dba1a9dd5b8ceeb078f15c73062f1942fd40e00ff",
+                    "0x06": "0xe0bfa28fc9b0f000b68fb921f7aa6aff81000000000000000000000000000001",
+                    "0x07": "0x8133b760dfae27560eb490f235ddfa301f058dee4f01f3fe4b3567d0d3f20101",
+                    "0x08": "0xcd4cd0124e983af71620fb5f98275965c6a8bebc4b8adc288b63224ee20e0101"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 (EXP 256 14)) [[ 1 ]] (EXP 256 (EXP 255 14)) [[ 2 ]] (EXP 256 (EXP 257 14)) [[ 3 ]] (EXP 255 (EXP 256 14)) [[ 4 ]] (EXP 255 (EXP 255 14)) [[ 5 ]] (EXP 255 (EXP 257 14)) [[ 6 ]] (EXP 257 (EXP 256 14)) [[ 7 ]] (EXP 257 (EXP 255 14)) [[ 8 ]] (EXP 257 (EXP 257 14)) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 (EXP 256 14)) [[ 1 ]] (EXP 256 (EXP 255 14)) [[ 2 ]] (EXP 256 (EXP 257 14)) [[ 3 ]] (EXP 255 (EXP 256 14)) [[ 4 ]] (EXP 255 (EXP 255 14)) [[ 5 ]] (EXP 255 (EXP 257 14)) [[ 6 ]] (EXP 257 (EXP 256 14)) [[ 7 ]] (EXP 257 (EXP 255 14)) [[ 8 ]] (EXP 257 (EXP 257 14)) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_15Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_15Filler.json
index 184c5c168..74b856ad6 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_15Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_15Filler.json
@@ -1,41 +1,41 @@
 {
     "expPowerOf256Of256_15": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "10000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x03" : "0x9882ec698218879ec55c33085514ff7f00000000000000000000000000000001",
-                    "0x04" : "0x75c4915e18b96704209738f5ca765568bb4dc4113d56683977825a132c8dfeff",
-                    "0x05" : "0x5c76839bf5a80b1da705dbdf43e4dd6770cd7501af11ff2dab7918dfe18f00ff",
-                    "0x06" : "0xbf228fc9b0f000b68fb921f7aa6aff8100000000000000000000000000000001",
-                    "0x07" : "0xc6a29131e7594004bc2aa79f0d2c402a1409c57c77d284c14b1a3ab0ff8fff01",
-                    "0x08" : "0xe6b3e5cf6ec90e532fef7d08455ebf92a03e9e3f6e224ea0febdf1a9f08f0101"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x9882ec698218879ec55c33085514ff7f00000000000000000000000000000001",
+                    "0x04": "0x75c4915e18b96704209738f5ca765568bb4dc4113d56683977825a132c8dfeff",
+                    "0x05": "0x5c76839bf5a80b1da705dbdf43e4dd6770cd7501af11ff2dab7918dfe18f00ff",
+                    "0x06": "0xbf228fc9b0f000b68fb921f7aa6aff8100000000000000000000000000000001",
+                    "0x07": "0xc6a29131e7594004bc2aa79f0d2c402a1409c57c77d284c14b1a3ab0ff8fff01",
+                    "0x08": "0xe6b3e5cf6ec90e532fef7d08455ebf92a03e9e3f6e224ea0febdf1a9f08f0101"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 (EXP 256 15)) [[ 1 ]] (EXP 256 (EXP 255 15)) [[ 2 ]] (EXP 256 (EXP 257 15)) [[ 3 ]] (EXP 255 (EXP 256 15)) [[ 4 ]] (EXP 255 (EXP 255 15)) [[ 5 ]] (EXP 255 (EXP 257 15)) [[ 6 ]] (EXP 257 (EXP 256 15)) [[ 7 ]] (EXP 257 (EXP 255 15)) [[ 8 ]] (EXP 257 (EXP 257 15)) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 (EXP 256 15)) [[ 1 ]] (EXP 256 (EXP 255 15)) [[ 2 ]] (EXP 256 (EXP 257 15)) [[ 3 ]] (EXP 255 (EXP 256 15)) [[ 4 ]] (EXP 255 (EXP 255 15)) [[ 5 ]] (EXP 255 (EXP 257 15)) [[ 6 ]] (EXP 257 (EXP 256 15)) [[ 7 ]] (EXP 257 (EXP 255 15)) [[ 8 ]] (EXP 257 (EXP 257 15)) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_16Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_16Filler.json
index d7ca716e3..f6faf89d2 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_16Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_16Filler.json
@@ -1,41 +1,41 @@
 {
     "expPowerOf256Of256_16": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "10000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x03" : "0x82ec698218879ec55c33085514ff7f0000000000000000000000000000000001",
-                    "0x04" : "0x3122f4bcdf6dd8b265cd18eb6af28c879aed44a35e0bf59273e39e6c7ff000ff",
-                    "0x05" : "0x6a2b3bc87a02c29b9d27757df43047ecd0f15485270fca27417a701c701000ff",
-                    "0x06" : "0x228fc9b0f000b68fb921f7aa6aff810000000000000000000000000000000001",
-                    "0x07" : "0x88e1259502eef93d46060aacc9e2ff506c734dade0b6714ab12d17e46ff00101",
-                    "0x08" : "0x4a103813c12c12169b218296bb0a9eae80cf8d2b158aa70eb990f99480100101"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x82ec698218879ec55c33085514ff7f0000000000000000000000000000000001",
+                    "0x04": "0x3122f4bcdf6dd8b265cd18eb6af28c879aed44a35e0bf59273e39e6c7ff000ff",
+                    "0x05": "0x6a2b3bc87a02c29b9d27757df43047ecd0f15485270fca27417a701c701000ff",
+                    "0x06": "0x228fc9b0f000b68fb921f7aa6aff810000000000000000000000000000000001",
+                    "0x07": "0x88e1259502eef93d46060aacc9e2ff506c734dade0b6714ab12d17e46ff00101",
+                    "0x08": "0x4a103813c12c12169b218296bb0a9eae80cf8d2b158aa70eb990f99480100101"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 (EXP 256 16)) [[ 1 ]] (EXP 256 (EXP 255 16)) [[ 2 ]] (EXP 256 (EXP 257 16)) [[ 3 ]] (EXP 255 (EXP 256 16)) [[ 4 ]] (EXP 255 (EXP 255 16)) [[ 5 ]] (EXP 255 (EXP 257 16)) [[ 6 ]] (EXP 257 (EXP 256 16)) [[ 7 ]] (EXP 257 (EXP 255 16)) [[ 8 ]] (EXP 257 (EXP 257 16)) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 (EXP 256 16)) [[ 1 ]] (EXP 256 (EXP 255 16)) [[ 2 ]] (EXP 256 (EXP 257 16)) [[ 3 ]] (EXP 255 (EXP 256 16)) [[ 4 ]] (EXP 255 (EXP 255 16)) [[ 5 ]] (EXP 255 (EXP 257 16)) [[ 6 ]] (EXP 257 (EXP 256 16)) [[ 7 ]] (EXP 257 (EXP 255 16)) [[ 8 ]] (EXP 257 (EXP 257 16)) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_17Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_17Filler.json
index caee450c5..062b4e5d4 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_17Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_17Filler.json
@@ -1,41 +1,41 @@
 {
     "expPowerOf256Of256_17": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "10000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x03" : "0xec698218879ec55c33085514ff7f000000000000000000000000000000000001",
-                    "0x04" : "0x722ad218eb1995a2d257c4c06d8de993c203cfc8e3512df7d633e17e908ffeff",
-                    "0x05" : "0x8ac9b5ec08d74612cb29f941481d274b51721af2296207c0da8d24667f9100ff",
-                    "0x06" : "0x8fc9b0f000b68fb921f7aa6aff81000000000000000000000000000000000001",
-                    "0x07" : "0x81d5ff63680841482299f3eab616446dcd336f537c0c565aa4112ab95d91ff01",
-                    "0x08" : "0x9c6ca90dac4e97dea02ac969e8649ee9e6232e0c3f4797411151cb8f90910101"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0xec698218879ec55c33085514ff7f000000000000000000000000000000000001",
+                    "0x04": "0x722ad218eb1995a2d257c4c06d8de993c203cfc8e3512df7d633e17e908ffeff",
+                    "0x05": "0x8ac9b5ec08d74612cb29f941481d274b51721af2296207c0da8d24667f9100ff",
+                    "0x06": "0x8fc9b0f000b68fb921f7aa6aff81000000000000000000000000000000000001",
+                    "0x07": "0x81d5ff63680841482299f3eab616446dcd336f537c0c565aa4112ab95d91ff01",
+                    "0x08": "0x9c6ca90dac4e97dea02ac969e8649ee9e6232e0c3f4797411151cb8f90910101"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 (EXP 256 17)) [[ 1 ]] (EXP 256 (EXP 255 17)) [[ 2 ]] (EXP 256 (EXP 257 17)) [[ 3 ]] (EXP 255 (EXP 256 17)) [[ 4 ]] (EXP 255 (EXP 255 17)) [[ 5 ]] (EXP 255 (EXP 257 17)) [[ 6 ]] (EXP 257 (EXP 256 17)) [[ 7 ]] (EXP 257 (EXP 255 17)) [[ 8 ]] (EXP 257 (EXP 257 17)) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 (EXP 256 17)) [[ 1 ]] (EXP 256 (EXP 255 17)) [[ 2 ]] (EXP 256 (EXP 257 17)) [[ 3 ]] (EXP 255 (EXP 256 17)) [[ 4 ]] (EXP 255 (EXP 255 17)) [[ 5 ]] (EXP 255 (EXP 257 17)) [[ 6 ]] (EXP 257 (EXP 256 17)) [[ 7 ]] (EXP 257 (EXP 255 17)) [[ 8 ]] (EXP 257 (EXP 257 17)) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_18Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_18Filler.json
index c5a301b27..714b1c559 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_18Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_18Filler.json
@@ -1,41 +1,41 @@
 {
     "expPowerOf256Of256_18": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "10000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x03" : "0x698218879ec55c33085514ff7f00000000000000000000000000000000000001",
-                    "0x04" : "0x8a2cbd9f40794e2205b13306f2aa0a43c60823c64b95d8601fa4f1e521ee00ff",
-                    "0x05" : "0xc1b5a1e3a81da51b10d84e880f0113ff67b863ddad3faf1f4ecf413f101200ff",
-                    "0x06" : "0xc9b0f000b68fb921f7aa6aff8100000000000000000000000000000000000001",
-                    "0x07" : "0x410be68e49452a1fbcd863bf6e8d637f8eae4979c34c88d552afbcc20fee0101",
-                    "0x08" : "0xf540cb714754b5b1eb0373833833bd7fb0ee925ce8b92962500b7a1c22120101"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x698218879ec55c33085514ff7f00000000000000000000000000000000000001",
+                    "0x04": "0x8a2cbd9f40794e2205b13306f2aa0a43c60823c64b95d8601fa4f1e521ee00ff",
+                    "0x05": "0xc1b5a1e3a81da51b10d84e880f0113ff67b863ddad3faf1f4ecf413f101200ff",
+                    "0x06": "0xc9b0f000b68fb921f7aa6aff8100000000000000000000000000000000000001",
+                    "0x07": "0x410be68e49452a1fbcd863bf6e8d637f8eae4979c34c88d552afbcc20fee0101",
+                    "0x08": "0xf540cb714754b5b1eb0373833833bd7fb0ee925ce8b92962500b7a1c22120101"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 (EXP 256 18)) [[ 1 ]] (EXP 256 (EXP 255 18)) [[ 2 ]] (EXP 256 (EXP 257 18)) [[ 3 ]] (EXP 255 (EXP 256 18)) [[ 4 ]] (EXP 255 (EXP 255 18)) [[ 5 ]] (EXP 255 (EXP 257 18)) [[ 6 ]] (EXP 257 (EXP 256 18)) [[ 7 ]] (EXP 257 (EXP 255 18)) [[ 8 ]] (EXP 257 (EXP 257 18)) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 (EXP 256 18)) [[ 1 ]] (EXP 256 (EXP 255 18)) [[ 2 ]] (EXP 256 (EXP 257 18)) [[ 3 ]] (EXP 255 (EXP 256 18)) [[ 4 ]] (EXP 255 (EXP 255 18)) [[ 5 ]] (EXP 255 (EXP 257 18)) [[ 6 ]] (EXP 257 (EXP 256 18)) [[ 7 ]] (EXP 257 (EXP 255 18)) [[ 8 ]] (EXP 257 (EXP 257 18)) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_19Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_19Filler.json
index 6c7b3b0c2..ec1cf0754 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_19Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_19Filler.json
@@ -1,41 +1,41 @@
 {
     "expPowerOf256Of256_19": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "10000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x03" : "0x8218879ec55c33085514ff7f0000000000000000000000000000000000000001",
-                    "0x04" : "0xb795ad7ac24cfbb7435cf53bd3584f3d4b2709935635c3ceb66e761ff091feff",
-                    "0x05" : "0x1f0bb7be91a0ccd0cca93d75cf03de3e6b56fe8f1c54242617665327219300ff",
-                    "0x06" : "0xb0f000b68fb921f7aa6aff810000000000000000000000000000000000000001",
-                    "0x07" : "0xad571756ecbff1bfdef064861e5e92c5d897a9cc380e54bdbaabd80bb793ff01",
-                    "0x08" : "0xd8b5b531989e689f700dcdb43ab90e79a49dfbbb5a13dbf751df98bb34930101"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x8218879ec55c33085514ff7f0000000000000000000000000000000000000001",
+                    "0x04": "0xb795ad7ac24cfbb7435cf53bd3584f3d4b2709935635c3ceb66e761ff091feff",
+                    "0x05": "0x1f0bb7be91a0ccd0cca93d75cf03de3e6b56fe8f1c54242617665327219300ff",
+                    "0x06": "0xb0f000b68fb921f7aa6aff810000000000000000000000000000000000000001",
+                    "0x07": "0xad571756ecbff1bfdef064861e5e92c5d897a9cc380e54bdbaabd80bb793ff01",
+                    "0x08": "0xd8b5b531989e689f700dcdb43ab90e79a49dfbbb5a13dbf751df98bb34930101"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 (EXP 256 19)) [[ 1 ]] (EXP 256 (EXP 255 19)) [[ 2 ]] (EXP 256 (EXP 257 19)) [[ 3 ]] (EXP 255 (EXP 256 19)) [[ 4 ]] (EXP 255 (EXP 255 19)) [[ 5 ]] (EXP 255 (EXP 257 19)) [[ 6 ]] (EXP 257 (EXP 256 19)) [[ 7 ]] (EXP 257 (EXP 255 19)) [[ 8 ]] (EXP 257 (EXP 257 19)) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 (EXP 256 19)) [[ 1 ]] (EXP 256 (EXP 255 19)) [[ 2 ]] (EXP 256 (EXP 257 19)) [[ 3 ]] (EXP 255 (EXP 256 19)) [[ 4 ]] (EXP 255 (EXP 255 19)) [[ 5 ]] (EXP 255 (EXP 257 19)) [[ 6 ]] (EXP 257 (EXP 256 19)) [[ 7 ]] (EXP 257 (EXP 255 19)) [[ 8 ]] (EXP 257 (EXP 257 19)) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_1Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_1Filler.json
index 7c2f04d7f..044c4f2ee 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_1Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_1Filler.json
@@ -1,41 +1,41 @@
 {
     "expPowerOf256Of256_1": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "10000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x03" : "0x06c3acd330b959ad6efabce6d2d2125e73a88a65a9880d203dddf5957f7f0001",
-                    "0x04" : "0x8f965a06da0ac41dcb3a34f1d8ab7d8fee620a94faa42c395997756b007ffeff",
-                    "0x05" : "0xbce9265d88a053c18bc229ebff404c1534e1db43de85131da0179fe9ff8100ff",
-                    "0x06" : "0x02b5e9d7a094c19f5ebdd4f2e618f859ed15e4f1f0351f286bf849eb7f810001",
-                    "0x07" : "0xc73b7a6f68385c653a24993bb72eea0e4ba17470816ec658cf9c5bedfd81ff01",
-                    "0x08" : "0xb89fc178355660fe1c92c7d8ff11524702fad6e2255447946442356b00810101"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x06c3acd330b959ad6efabce6d2d2125e73a88a65a9880d203dddf5957f7f0001",
+                    "0x04": "0x8f965a06da0ac41dcb3a34f1d8ab7d8fee620a94faa42c395997756b007ffeff",
+                    "0x05": "0xbce9265d88a053c18bc229ebff404c1534e1db43de85131da0179fe9ff8100ff",
+                    "0x06": "0x02b5e9d7a094c19f5ebdd4f2e618f859ed15e4f1f0351f286bf849eb7f810001",
+                    "0x07": "0xc73b7a6f68385c653a24993bb72eea0e4ba17470816ec658cf9c5bedfd81ff01",
+                    "0x08": "0xb89fc178355660fe1c92c7d8ff11524702fad6e2255447946442356b00810101"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 (EXP 256 1)) [[ 1 ]] (EXP 256 (EXP 255 1)) [[ 2 ]] (EXP 256 (EXP 257 1)) [[ 3 ]] (EXP 255 (EXP 256 1)) [[ 4 ]] (EXP 255 (EXP 255 1)) [[ 5 ]] (EXP 255 (EXP 257 1)) [[ 6 ]] (EXP 257 (EXP 256 1)) [[ 7 ]] (EXP 257 (EXP 255 1)) [[ 8 ]] (EXP 257 (EXP 257 1)) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 (EXP 256 1)) [[ 1 ]] (EXP 256 (EXP 255 1)) [[ 2 ]] (EXP 256 (EXP 257 1)) [[ 3 ]] (EXP 255 (EXP 256 1)) [[ 4 ]] (EXP 255 (EXP 255 1)) [[ 5 ]] (EXP 255 (EXP 257 1)) [[ 6 ]] (EXP 257 (EXP 256 1)) [[ 7 ]] (EXP 257 (EXP 255 1)) [[ 8 ]] (EXP 257 (EXP 257 1)) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_20Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_20Filler.json
index 939deb891..737cf324b 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_20Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_20Filler.json
@@ -1,41 +1,41 @@
 {
     "expPowerOf256Of256_20": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "10000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x03" : "0x18879ec55c33085514ff7f000000000000000000000000000000000000000001",
-                    "0x04" : "0x67e4797dc21f02ce4a7c52218c7dbea5d212e6c244e24f0ba4c08613c7ec00ff",
-                    "0x05" : "0xa1ce1a085f258785846939cc1d2e8725ac94ad4dff8913234e00679fb41400ff",
-                    "0x06" : "0xf000b68fb921f7aa6aff81000000000000000000000000000000000000000001",
-                    "0x07" : "0xcce501857a1cb45473915a28082af950e0f78f7e2de68ce748adb661b3ec0101",
-                    "0x08" : "0x3b2e28d274a16c08b58a23bad63bba6d7b09685769d1f68ca3873bedc8140101"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x18879ec55c33085514ff7f000000000000000000000000000000000000000001",
+                    "0x04": "0x67e4797dc21f02ce4a7c52218c7dbea5d212e6c244e24f0ba4c08613c7ec00ff",
+                    "0x05": "0xa1ce1a085f258785846939cc1d2e8725ac94ad4dff8913234e00679fb41400ff",
+                    "0x06": "0xf000b68fb921f7aa6aff81000000000000000000000000000000000000000001",
+                    "0x07": "0xcce501857a1cb45473915a28082af950e0f78f7e2de68ce748adb661b3ec0101",
+                    "0x08": "0x3b2e28d274a16c08b58a23bad63bba6d7b09685769d1f68ca3873bedc8140101"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 (EXP 256 20)) [[ 1 ]] (EXP 256 (EXP 255 20)) [[ 2 ]] (EXP 256 (EXP 257 20)) [[ 3 ]] (EXP 255 (EXP 256 20)) [[ 4 ]] (EXP 255 (EXP 255 20)) [[ 5 ]] (EXP 255 (EXP 257 20)) [[ 6 ]] (EXP 257 (EXP 256 20)) [[ 7 ]] (EXP 257 (EXP 255 20)) [[ 8 ]] (EXP 257 (EXP 257 20)) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 (EXP 256 20)) [[ 1 ]] (EXP 256 (EXP 255 20)) [[ 2 ]] (EXP 256 (EXP 257 20)) [[ 3 ]] (EXP 255 (EXP 256 20)) [[ 4 ]] (EXP 255 (EXP 255 20)) [[ 5 ]] (EXP 255 (EXP 257 20)) [[ 6 ]] (EXP 257 (EXP 256 20)) [[ 7 ]] (EXP 257 (EXP 255 20)) [[ 8 ]] (EXP 257 (EXP 257 20)) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_21Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_21Filler.json
index 5936ed5ef..03898c12e 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_21Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_21Filler.json
@@ -1,41 +1,41 @@
 {
     "expPowerOf256Of256_21": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "10000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x03" : "0x879ec55c33085514ff7f00000000000000000000000000000000000000000001",
-                    "0x04" : "0x7fd07055ff50cdfe4b4bd9a15133d72d3607d92eb7ac81bac93db7ff4c93feff",
-                    "0x05" : "0x665ac5c769e87f61d5993abc26522fbfca2734d76a63216b2d550d29c79500ff",
-                    "0x06" : "0xb68fb921f7aa6aff8100000000000000000000000000000000000000000001",
-                    "0x07" : "0x1c93db67c9884bc694686d69a25a5d7ed089841d5ce147fdd7199ab00d95ff01",
-                    "0x08" : "0x485053d8ff66be52036597520344fac87b6a305426a9e49221d3f934dc950101"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x879ec55c33085514ff7f00000000000000000000000000000000000000000001",
+                    "0x04": "0x7fd07055ff50cdfe4b4bd9a15133d72d3607d92eb7ac81bac93db7ff4c93feff",
+                    "0x05": "0x665ac5c769e87f61d5993abc26522fbfca2734d76a63216b2d550d29c79500ff",
+                    "0x06": "0xb68fb921f7aa6aff8100000000000000000000000000000000000000000001",
+                    "0x07": "0x1c93db67c9884bc694686d69a25a5d7ed089841d5ce147fdd7199ab00d95ff01",
+                    "0x08": "0x485053d8ff66be52036597520344fac87b6a305426a9e49221d3f934dc950101"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 (EXP 256 21)) [[ 1 ]] (EXP 256 (EXP 255 21)) [[ 2 ]] (EXP 256 (EXP 257 21)) [[ 3 ]] (EXP 255 (EXP 256 21)) [[ 4 ]] (EXP 255 (EXP 255 21)) [[ 5 ]] (EXP 255 (EXP 257 21)) [[ 6 ]] (EXP 257 (EXP 256 21)) [[ 7 ]] (EXP 257 (EXP 255 21)) [[ 8 ]] (EXP 257 (EXP 257 21)) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 (EXP 256 21)) [[ 1 ]] (EXP 256 (EXP 255 21)) [[ 2 ]] (EXP 256 (EXP 257 21)) [[ 3 ]] (EXP 255 (EXP 256 21)) [[ 4 ]] (EXP 255 (EXP 255 21)) [[ 5 ]] (EXP 255 (EXP 257 21)) [[ 6 ]] (EXP 257 (EXP 256 21)) [[ 7 ]] (EXP 257 (EXP 255 21)) [[ 8 ]] (EXP 257 (EXP 257 21)) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_22Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_22Filler.json
index 0d4b46cb6..d1efaf731 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_22Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_22Filler.json
@@ -1,41 +1,41 @@
 {
     "expPowerOf256Of256_22": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "10000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x03" : "0x9ec55c33085514ff7f0000000000000000000000000000000000000000000001",
-                    "0x04" : "0xec447e662ac08957d7e290a421dbf54c0aaf43aadc9cc465ad0b02f071ea00ff",
-                    "0x05" : "0xdc9178d3bab470096f01477c859b5f4173986640b659426412a653465c1600ff",
-                    "0x06" : "0xb68fb921f7aa6aff810000000000000000000000000000000000000000000001",
-                    "0x07" : "0xdcf0a770777610503596ae0311af46c171151ed45107d7e7bb8f74bb5bea0101",
-                    "0x08" : "0x4d65773387993928c95c861274232d3fb6f6b7fe1b22e4e61a30e71172160101"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x9ec55c33085514ff7f0000000000000000000000000000000000000000000001",
+                    "0x04": "0xec447e662ac08957d7e290a421dbf54c0aaf43aadc9cc465ad0b02f071ea00ff",
+                    "0x05": "0xdc9178d3bab470096f01477c859b5f4173986640b659426412a653465c1600ff",
+                    "0x06": "0xb68fb921f7aa6aff810000000000000000000000000000000000000000000001",
+                    "0x07": "0xdcf0a770777610503596ae0311af46c171151ed45107d7e7bb8f74bb5bea0101",
+                    "0x08": "0x4d65773387993928c95c861274232d3fb6f6b7fe1b22e4e61a30e71172160101"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 (EXP 256 22)) [[ 1 ]] (EXP 256 (EXP 255 22)) [[ 2 ]] (EXP 256 (EXP 257 22)) [[ 3 ]] (EXP 255 (EXP 256 22)) [[ 4 ]] (EXP 255 (EXP 255 22)) [[ 5 ]] (EXP 255 (EXP 257 22)) [[ 6 ]] (EXP 257 (EXP 256 22)) [[ 7 ]] (EXP 257 (EXP 255 22)) [[ 8 ]] (EXP 257 (EXP 257 22)) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 (EXP 256 22)) [[ 1 ]] (EXP 256 (EXP 255 22)) [[ 2 ]] (EXP 256 (EXP 257 22)) [[ 3 ]] (EXP 255 (EXP 256 22)) [[ 4 ]] (EXP 255 (EXP 255 22)) [[ 5 ]] (EXP 255 (EXP 257 22)) [[ 6 ]] (EXP 257 (EXP 256 22)) [[ 7 ]] (EXP 257 (EXP 255 22)) [[ 8 ]] (EXP 257 (EXP 257 22)) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_23Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_23Filler.json
index cf4796a76..3acd44404 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_23Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_23Filler.json
@@ -1,41 +1,41 @@
 {
     "expPowerOf256Of256_23": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "10000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x03" : "0xc55c33085514ff7f000000000000000000000000000000000000000000000001",
-                    "0x04" : "0x537ca0f03f974303005f1e6693b55b72315a166841732e42b8353724a495feff",
-                    "0x05" : "0x86418797ec60058de6cca47dfdbee79923ac49d7801e01840041ca76719700ff",
-                    "0x06" : "0x8fb921f7aa6aff81000000000000000000000000000000000000000000000001",
-                    "0x07" : "0x56a55341ab8d4318f1cfb55d5f21e2ba35d7e070a72bac6b2b21baae5f97ff01",
-                    "0x08" : "0x55ddd0ec77909de6d8311116cf520398e816f928b06fdd90ec239d0488970101"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0xc55c33085514ff7f000000000000000000000000000000000000000000000001",
+                    "0x04": "0x537ca0f03f974303005f1e6693b55b72315a166841732e42b8353724a495feff",
+                    "0x05": "0x86418797ec60058de6cca47dfdbee79923ac49d7801e01840041ca76719700ff",
+                    "0x06": "0x8fb921f7aa6aff81000000000000000000000000000000000000000000000001",
+                    "0x07": "0x56a55341ab8d4318f1cfb55d5f21e2ba35d7e070a72bac6b2b21baae5f97ff01",
+                    "0x08": "0x55ddd0ec77909de6d8311116cf520398e816f928b06fdd90ec239d0488970101"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 (EXP 256 23)) [[ 1 ]] (EXP 256 (EXP 255 23)) [[ 2 ]] (EXP 256 (EXP 257 23)) [[ 3 ]] (EXP 255 (EXP 256 23)) [[ 4 ]] (EXP 255 (EXP 255 23)) [[ 5 ]] (EXP 255 (EXP 257 23)) [[ 6 ]] (EXP 257 (EXP 256 23)) [[ 7 ]] (EXP 257 (EXP 255 23)) [[ 8 ]] (EXP 257 (EXP 257 23)) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 (EXP 256 23)) [[ 1 ]] (EXP 256 (EXP 255 23)) [[ 2 ]] (EXP 256 (EXP 257 23)) [[ 3 ]] (EXP 255 (EXP 256 23)) [[ 4 ]] (EXP 255 (EXP 255 23)) [[ 5 ]] (EXP 255 (EXP 257 23)) [[ 6 ]] (EXP 257 (EXP 256 23)) [[ 7 ]] (EXP 257 (EXP 255 23)) [[ 8 ]] (EXP 257 (EXP 257 23)) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_24Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_24Filler.json
index 4b173cd00..1f070cc11 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_24Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_24Filler.json
@@ -1,41 +1,41 @@
 {
     "expPowerOf256Of256_24": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "10000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x03" : "0x5c33085514ff7f00000000000000000000000000000000000000000000000001",
-                    "0x04" : "0xd542e526003539ead104274aff2d78332366e29d328c2161f0c120731fe800ff",
-                    "0x05" : "0xc706cb25e8384ce9bb5c9cb48415238ba03e16c448e292c0a101843b081800ff",
-                    "0x06" : "0xb921f7aa6aff8100000000000000000000000000000000000000000000000001",
-                    "0x07" : "0x4ca55f89202c524cb0f1cb3195d13c8d94a9f7a05c59e1d4031577c707e80101",
-                    "0x08" : "0x8c4b0574e9156b80035f3ecdcf1fe79d273ed7559747a4322bcd338f20180101"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x5c33085514ff7f00000000000000000000000000000000000000000000000001",
+                    "0x04": "0xd542e526003539ead104274aff2d78332366e29d328c2161f0c120731fe800ff",
+                    "0x05": "0xc706cb25e8384ce9bb5c9cb48415238ba03e16c448e292c0a101843b081800ff",
+                    "0x06": "0xb921f7aa6aff8100000000000000000000000000000000000000000000000001",
+                    "0x07": "0x4ca55f89202c524cb0f1cb3195d13c8d94a9f7a05c59e1d4031577c707e80101",
+                    "0x08": "0x8c4b0574e9156b80035f3ecdcf1fe79d273ed7559747a4322bcd338f20180101"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 (EXP 256 24)) [[ 1 ]] (EXP 256 (EXP 255 24)) [[ 2 ]] (EXP 256 (EXP 257 24)) [[ 3 ]] (EXP 255 (EXP 256 24)) [[ 4 ]] (EXP 255 (EXP 255 24)) [[ 5 ]] (EXP 255 (EXP 257 24)) [[ 6 ]] (EXP 257 (EXP 256 24)) [[ 7 ]] (EXP 257 (EXP 255 24)) [[ 8 ]] (EXP 257 (EXP 257 24)) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 (EXP 256 24)) [[ 1 ]] (EXP 256 (EXP 255 24)) [[ 2 ]] (EXP 256 (EXP 257 24)) [[ 3 ]] (EXP 255 (EXP 256 24)) [[ 4 ]] (EXP 255 (EXP 255 24)) [[ 5 ]] (EXP 255 (EXP 257 24)) [[ 6 ]] (EXP 257 (EXP 256 24)) [[ 7 ]] (EXP 257 (EXP 255 24)) [[ 8 ]] (EXP 257 (EXP 257 24)) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_25Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_25Filler.json
index 01484bb0f..9401d7b33 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_25Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_25Filler.json
@@ -1,41 +1,41 @@
 {
-     "expPowerOf256Of256_25": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "10000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+    "expPowerOf256Of256_25": {
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x03" : "0x33085514ff7f0000000000000000000000000000000000000000000000000001",
-                    "0x04" : "0x7f510dd7198cac0a92ff7ea80451838c0dfa12114c41a0ef05907397f897feff",
-                    "0x05" : "0x1275e752b6aee228ecba5e9b57ef1111deff3c651e2cfbf2cccd13151f9900ff",
-                    "0x06" : "0x21f7aa6aff810000000000000000000000000000000000000000000000000001",
-                    "0x07" : "0x6646340ad51a03bb710caf05756b685b33c7dad62ae68d369243700ead99ff01",
-                    "0x08" : "0x29d80e8060ef2221929bb18215586c742686d6860e028ca0456b443238990101"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x33085514ff7f0000000000000000000000000000000000000000000000000001",
+                    "0x04": "0x7f510dd7198cac0a92ff7ea80451838c0dfa12114c41a0ef05907397f897feff",
+                    "0x05": "0x1275e752b6aee228ecba5e9b57ef1111deff3c651e2cfbf2cccd13151f9900ff",
+                    "0x06": "0x21f7aa6aff810000000000000000000000000000000000000000000000000001",
+                    "0x07": "0x6646340ad51a03bb710caf05756b685b33c7dad62ae68d369243700ead99ff01",
+                    "0x08": "0x29d80e8060ef2221929bb18215586c742686d6860e028ca0456b443238990101"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 (EXP 256 25)) [[ 1 ]] (EXP 256 (EXP 255 25)) [[ 2 ]] (EXP 256 (EXP 257 25)) [[ 3 ]] (EXP 255 (EXP 256 25)) [[ 4 ]] (EXP 255 (EXP 255 25)) [[ 5 ]] (EXP 255 (EXP 257 25)) [[ 6 ]] (EXP 257 (EXP 256 25)) [[ 7 ]] (EXP 257 (EXP 255 25)) [[ 8 ]] (EXP 257 (EXP 257 25)) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 (EXP 256 25)) [[ 1 ]] (EXP 256 (EXP 255 25)) [[ 2 ]] (EXP 256 (EXP 257 25)) [[ 3 ]] (EXP 255 (EXP 256 25)) [[ 4 ]] (EXP 255 (EXP 255 25)) [[ 5 ]] (EXP 255 (EXP 257 25)) [[ 6 ]] (EXP 257 (EXP 256 25)) [[ 7 ]] (EXP 257 (EXP 255 25)) [[ 8 ]] (EXP 257 (EXP 257 25)) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_26Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_26Filler.json
index b0008ed19..c04f71d06 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_26Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_26Filler.json
@@ -1,41 +1,41 @@
 {
-     "expPowerOf256Of256_26": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "10000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+    "expPowerOf256Of256_26": {
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x03" : "0x085514ff7f000000000000000000000000000000000000000000000000000001",
-                    "0x04" : "0x1d164db738eb6893868b361ad2803f97be35764456e82a837667a693d1e600ff",
-                    "0x05" : "0x8b92c24abebf376a5aab5ff4dfd3538a03d38a10bced2aae8e1a8a85b81a00ff",
-                    "0x06" : "0xf7aa6aff81000000000000000000000000000000000000000000000000000001",
-                    "0x07" : "0x6931bda98c70e860a1f6a5224940f1ec7e6734cd9456c95806384f7cb7e60101",
-                    "0x08" : "0x3402a9db66492dfc2a220715e76243469462f24edc56903ba1d8e96ed21a0101"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x085514ff7f000000000000000000000000000000000000000000000000000001",
+                    "0x04": "0x1d164db738eb6893868b361ad2803f97be35764456e82a837667a693d1e600ff",
+                    "0x05": "0x8b92c24abebf376a5aab5ff4dfd3538a03d38a10bced2aae8e1a8a85b81a00ff",
+                    "0x06": "0xf7aa6aff81000000000000000000000000000000000000000000000000000001",
+                    "0x07": "0x6931bda98c70e860a1f6a5224940f1ec7e6734cd9456c95806384f7cb7e60101",
+                    "0x08": "0x3402a9db66492dfc2a220715e76243469462f24edc56903ba1d8e96ed21a0101"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 (EXP 256 26)) [[ 1 ]] (EXP 256 (EXP 255 26)) [[ 2 ]] (EXP 256 (EXP 257 26)) [[ 3 ]] (EXP 255 (EXP 256 26)) [[ 4 ]] (EXP 255 (EXP 255 26)) [[ 5 ]] (EXP 255 (EXP 257 26)) [[ 6 ]] (EXP 257 (EXP 256 26)) [[ 7 ]] (EXP 257 (EXP 255 26)) [[ 8 ]] (EXP 257 (EXP 257 26)) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 (EXP 256 26)) [[ 1 ]] (EXP 256 (EXP 255 26)) [[ 2 ]] (EXP 256 (EXP 257 26)) [[ 3 ]] (EXP 255 (EXP 256 26)) [[ 4 ]] (EXP 255 (EXP 255 26)) [[ 5 ]] (EXP 255 (EXP 257 26)) [[ 6 ]] (EXP 257 (EXP 256 26)) [[ 7 ]] (EXP 257 (EXP 255 26)) [[ 8 ]] (EXP 257 (EXP 257 26)) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_27Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_27Filler.json
index 55f2ac10e..73df82a5e 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_27Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_27Filler.json
@@ -1,41 +1,41 @@
 {
     "expPowerOf256Of256_27": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "10000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x03" : "0x5514ff7f00000000000000000000000000000000000000000000000000000001",
-                    "0x04" : "0x178918ffbcb401d4efd2f7dfb4d01a897172267f0f491121ac52dd614899feff",
-                    "0x05" : "0x38ecff71480ca0b422f2ed6f780d5fead2ae234a49104b10a86f7f0dd19b00ff",
-                    "0x06" : "0xaa6aff8100000000000000000000000000000000000000000000000000000001",
-                    "0x07" : "0xd02811cb5dc1d80567e810532b235b7672f5c78cd6e89bb511d5e2d8f79bff01",
-                    "0x08" : "0x1b4e6404f474c18055d30bb8987672f59e97980d6f9de1764c0fbec5ec9b0101"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x5514ff7f00000000000000000000000000000000000000000000000000000001",
+                    "0x04": "0x178918ffbcb401d4efd2f7dfb4d01a897172267f0f491121ac52dd614899feff",
+                    "0x05": "0x38ecff71480ca0b422f2ed6f780d5fead2ae234a49104b10a86f7f0dd19b00ff",
+                    "0x06": "0xaa6aff8100000000000000000000000000000000000000000000000000000001",
+                    "0x07": "0xd02811cb5dc1d80567e810532b235b7672f5c78cd6e89bb511d5e2d8f79bff01",
+                    "0x08": "0x1b4e6404f474c18055d30bb8987672f59e97980d6f9de1764c0fbec5ec9b0101"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 (EXP 256 27)) [[ 1 ]] (EXP 256 (EXP 255 27)) [[ 2 ]] (EXP 256 (EXP 257 27)) [[ 3 ]] (EXP 255 (EXP 256 27)) [[ 4 ]] (EXP 255 (EXP 255 27)) [[ 5 ]] (EXP 255 (EXP 257 27)) [[ 6 ]] (EXP 257 (EXP 256 27)) [[ 7 ]] (EXP 257 (EXP 255 27)) [[ 8 ]] (EXP 257 (EXP 257 27)) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 (EXP 256 27)) [[ 1 ]] (EXP 256 (EXP 255 27)) [[ 2 ]] (EXP 256 (EXP 257 27)) [[ 3 ]] (EXP 255 (EXP 256 27)) [[ 4 ]] (EXP 255 (EXP 255 27)) [[ 5 ]] (EXP 255 (EXP 257 27)) [[ 6 ]] (EXP 257 (EXP 256 27)) [[ 7 ]] (EXP 257 (EXP 255 27)) [[ 8 ]] (EXP 257 (EXP 257 27)) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_28Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_28Filler.json
index f3b93877a..1202d80cb 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_28Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_28Filler.json
@@ -1,41 +1,41 @@
 {
     "expPowerOf256Of256_28": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "10000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x03" : "0x14ff7f0000000000000000000000000000000000000000000000000000000001",
-                    "0x04" : "0xffd368e44b3f85cb81ae394c9809ca9fa2db46a83d7880a912ab6d4a87e400ff",
-                    "0x05" : "0x0981ad53c19b15a94bcf0bf20235dd0da9df25f46ae635029fe2062e6c1c00ff",
-                    "0x06" : "0x6aff810000000000000000000000000000000000000000000000000000000001",
-                    "0x07" : "0x19df06ffa28250867006726405fbc05d43dc2f9d2f025006db089bd46be40101",
-                    "0x08" : "0x243fffe3a4f2982f45055c08f379648ab886da8027a7401117a8e0b8881c0101"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x14ff7f0000000000000000000000000000000000000000000000000000000001",
+                    "0x04": "0xffd368e44b3f85cb81ae394c9809ca9fa2db46a83d7880a912ab6d4a87e400ff",
+                    "0x05": "0x0981ad53c19b15a94bcf0bf20235dd0da9df25f46ae635029fe2062e6c1c00ff",
+                    "0x06": "0x6aff810000000000000000000000000000000000000000000000000000000001",
+                    "0x07": "0x19df06ffa28250867006726405fbc05d43dc2f9d2f025006db089bd46be40101",
+                    "0x08": "0x243fffe3a4f2982f45055c08f379648ab886da8027a7401117a8e0b8881c0101"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 (EXP 256 28)) [[ 1 ]] (EXP 256 (EXP 255 28)) [[ 2 ]] (EXP 256 (EXP 257 28)) [[ 3 ]] (EXP 255 (EXP 256 28)) [[ 4 ]] (EXP 255 (EXP 255 28)) [[ 5 ]] (EXP 255 (EXP 257 28)) [[ 6 ]] (EXP 257 (EXP 256 28)) [[ 7 ]] (EXP 257 (EXP 255 28)) [[ 8 ]] (EXP 257 (EXP 257 28)) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 (EXP 256 28)) [[ 1 ]] (EXP 256 (EXP 255 28)) [[ 2 ]] (EXP 256 (EXP 257 28)) [[ 3 ]] (EXP 255 (EXP 256 28)) [[ 4 ]] (EXP 255 (EXP 255 28)) [[ 5 ]] (EXP 255 (EXP 257 28)) [[ 6 ]] (EXP 257 (EXP 256 28)) [[ 7 ]] (EXP 257 (EXP 255 28)) [[ 8 ]] (EXP 257 (EXP 257 28)) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_29Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_29Filler.json
index 538d29837..0b7dd5364 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_29Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_29Filler.json
@@ -1,41 +1,41 @@
 {
     "expPowerOf256Of256_29": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "10000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x03" : "0xff7f000000000000000000000000000000000000000000000000000000000001",
-                    "0x04" : "0x41e065d46e0349cfe624c4e8a2034aea1f7edfff80e511cd8067d488949bfeff",
-                    "0x05" : "0xa84162ca6675a22c4c79dfc4ea15f760db5a04dbf04246764199b668879d00ff",
-                    "0x06" : "0xff81000000000000000000000000000000000000000000000000000000000001",
-                    "0x07" : "0x1226984faa6b05ebdbd45d8477fa4fd5b55bfd5061de03c319282b153d9dff01",
-                    "0x08" : "0x5cc9e6b0b749fd94541ad00364bdec2fca7816981ca3e38f485decc7a49d0101"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0xff7f000000000000000000000000000000000000000000000000000000000001",
+                    "0x04": "0x41e065d46e0349cfe624c4e8a2034aea1f7edfff80e511cd8067d488949bfeff",
+                    "0x05": "0xa84162ca6675a22c4c79dfc4ea15f760db5a04dbf04246764199b668879d00ff",
+                    "0x06": "0xff81000000000000000000000000000000000000000000000000000000000001",
+                    "0x07": "0x1226984faa6b05ebdbd45d8477fa4fd5b55bfd5061de03c319282b153d9dff01",
+                    "0x08": "0x5cc9e6b0b749fd94541ad00364bdec2fca7816981ca3e38f485decc7a49d0101"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 (EXP 256 29)) [[ 1 ]] (EXP 256 (EXP 255 29)) [[ 2 ]] (EXP 256 (EXP 257 29)) [[ 3 ]] (EXP 255 (EXP 256 29)) [[ 4 ]] (EXP 255 (EXP 255 29)) [[ 5 ]] (EXP 255 (EXP 257 29)) [[ 6 ]] (EXP 257 (EXP 256 29)) [[ 7 ]] (EXP 257 (EXP 255 29)) [[ 8 ]] (EXP 257 (EXP 257 29)) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 (EXP 256 29)) [[ 1 ]] (EXP 256 (EXP 255 29)) [[ 2 ]] (EXP 256 (EXP 257 29)) [[ 3 ]] (EXP 255 (EXP 256 29)) [[ 4 ]] (EXP 255 (EXP 255 29)) [[ 5 ]] (EXP 255 (EXP 257 29)) [[ 6 ]] (EXP 257 (EXP 256 29)) [[ 7 ]] (EXP 257 (EXP 255 29)) [[ 8 ]] (EXP 257 (EXP 257 29)) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_2Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_2Filler.json
index 6a5f2f6ed..f7eb902f5 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_2Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_2Filler.json
@@ -1,41 +1,41 @@
 {
     "expPowerOf256Of256_2": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "10000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x03" : "0x4ee4ceeaac565c81f55a87c43f82f7c889ef4fc7c679671e28d594ff7f000001",
-                    "0x04" : "0x82f46a1b4e34d66712910615d2571d75606ceac51fa8ca8c58cf6ca881fe00ff",
-                    "0x05" : "0x81c9fcefa5de158ae2007f25d35c0d11cd735342a48905955a5a6852800200ff",
-                    "0x06" : "0x666ac362902470ed850709e2a29969d10cba09debc03c38d172aeaff81000001",
-                    "0x07" : "0xeb30a3c678a01bde914548f98f3366dc0ffe9f85384ebf1111d03dad7ffe0101",
-                    "0x08" : "0x72d0a7939b6303ce1d46e6e3f1b8be303bfdb2b00f41ad8076b0975782020101"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x4ee4ceeaac565c81f55a87c43f82f7c889ef4fc7c679671e28d594ff7f000001",
+                    "0x04": "0x82f46a1b4e34d66712910615d2571d75606ceac51fa8ca8c58cf6ca881fe00ff",
+                    "0x05": "0x81c9fcefa5de158ae2007f25d35c0d11cd735342a48905955a5a6852800200ff",
+                    "0x06": "0x666ac362902470ed850709e2a29969d10cba09debc03c38d172aeaff81000001",
+                    "0x07": "0xeb30a3c678a01bde914548f98f3366dc0ffe9f85384ebf1111d03dad7ffe0101",
+                    "0x08": "0x72d0a7939b6303ce1d46e6e3f1b8be303bfdb2b00f41ad8076b0975782020101"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 (EXP 256 2)) [[ 1 ]] (EXP 256 (EXP 255 2)) [[ 2 ]] (EXP 256 (EXP 257 2)) [[ 3 ]] (EXP 255 (EXP 256 2)) [[ 4 ]] (EXP 255 (EXP 255 2)) [[ 5 ]] (EXP 255 (EXP 257 2)) [[ 6 ]] (EXP 257 (EXP 256 2)) [[ 7 ]] (EXP 257 (EXP 255 2)) [[ 8 ]] (EXP 257 (EXP 257 2)) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 (EXP 256 2)) [[ 1 ]] (EXP 256 (EXP 255 2)) [[ 2 ]] (EXP 256 (EXP 257 2)) [[ 3 ]] (EXP 255 (EXP 256 2)) [[ 4 ]] (EXP 255 (EXP 255 2)) [[ 5 ]] (EXP 255 (EXP 257 2)) [[ 6 ]] (EXP 257 (EXP 256 2)) [[ 7 ]] (EXP 257 (EXP 255 2)) [[ 8 ]] (EXP 257 (EXP 257 2)) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_30Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_30Filler.json
index ccbd9cace..96cfa5692 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_30Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_30Filler.json
@@ -1,41 +1,41 @@
 {
     "expPowerOf256Of256_30": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "10000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x03" : "0x7f00000000000000000000000000000000000000000000000000000000000001",
-                    "0x04" : "0xe9772778f50fa0a69cd10fa019ac56d72ac7a7d7af26c4ba28415c8f41e200ff",
-                    "0x05" : "0x33f0385ef73feebdb952e5adb643dd0fa178fd9271578219ad50a73d241e00ff",
-                    "0x06" : "0x8100000000000000000000000000000000000000000000000000000000000001",
-                    "0x07" : "0xfd405cce8f73dffc04a6f0ff6ffc6bf7961876d09c5b4933a68f0cc623e20101",
-                    "0x08" : "0xc5a8f4566fd2e96e4ce3a8b3ec0863e7b20bc3b2f3dc5261ba8a0174421e0101"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x7f00000000000000000000000000000000000000000000000000000000000001",
+                    "0x04": "0xe9772778f50fa0a69cd10fa019ac56d72ac7a7d7af26c4ba28415c8f41e200ff",
+                    "0x05": "0x33f0385ef73feebdb952e5adb643dd0fa178fd9271578219ad50a73d241e00ff",
+                    "0x06": "0x8100000000000000000000000000000000000000000000000000000000000001",
+                    "0x07": "0xfd405cce8f73dffc04a6f0ff6ffc6bf7961876d09c5b4933a68f0cc623e20101",
+                    "0x08": "0xc5a8f4566fd2e96e4ce3a8b3ec0863e7b20bc3b2f3dc5261ba8a0174421e0101"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 (EXP 256 30)) [[ 1 ]] (EXP 256 (EXP 255 30)) [[ 2 ]] (EXP 256 (EXP 257 30)) [[ 3 ]] (EXP 255 (EXP 256 30)) [[ 4 ]] (EXP 255 (EXP 255 30)) [[ 5 ]] (EXP 255 (EXP 257 30)) [[ 6 ]] (EXP 257 (EXP 256 30)) [[ 7 ]] (EXP 257 (EXP 255 30)) [[ 8 ]] (EXP 257 (EXP 257 30)) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 (EXP 256 30)) [[ 1 ]] (EXP 256 (EXP 255 30)) [[ 2 ]] (EXP 256 (EXP 257 30)) [[ 3 ]] (EXP 255 (EXP 256 30)) [[ 4 ]] (EXP 255 (EXP 255 30)) [[ 5 ]] (EXP 255 (EXP 257 30)) [[ 6 ]] (EXP 257 (EXP 256 30)) [[ 7 ]] (EXP 257 (EXP 255 30)) [[ 8 ]] (EXP 257 (EXP 257 30)) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_31Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_31Filler.json
index 960a7cf45..45485dbeb 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_31Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_31Filler.json
@@ -1,41 +1,41 @@
 {
     "expPowerOf256Of256_31": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "10000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x03" : "0x01",
-                    "0x04" : "0xf9cb87f5b1ab58602f52a1e9d392e5675b86a59a53943a8d4ec2a915dc9dfeff",
-                    "0x05" : "0x893d729a64e318860ec5047e70e598da163eb41e71e74b04dfd4712d419f00ff",
-                    "0x06" : "0x01",
-                    "0x07" : "0xee5f2839c1b4f6ca05e6fdb04e2fb49c0f860b3765c27dc781a150cb7f9fff01",
-                    "0x08" : "0xb4c358e3c6bcddfb509ea487d733df0e1854f29c3b6bfd4a8caabe3f609f0101"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x01",
+                    "0x04": "0xf9cb87f5b1ab58602f52a1e9d392e5675b86a59a53943a8d4ec2a915dc9dfeff",
+                    "0x05": "0x893d729a64e318860ec5047e70e598da163eb41e71e74b04dfd4712d419f00ff",
+                    "0x06": "0x01",
+                    "0x07": "0xee5f2839c1b4f6ca05e6fdb04e2fb49c0f860b3765c27dc781a150cb7f9fff01",
+                    "0x08": "0xb4c358e3c6bcddfb509ea487d733df0e1854f29c3b6bfd4a8caabe3f609f0101"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 (EXP 256 31)) [[ 1 ]] (EXP 256 (EXP 255 31)) [[ 2 ]] (EXP 256 (EXP 257 31)) [[ 3 ]] (EXP 255 (EXP 256 31)) [[ 4 ]] (EXP 255 (EXP 255 31)) [[ 5 ]] (EXP 255 (EXP 257 31)) [[ 6 ]] (EXP 257 (EXP 256 31)) [[ 7 ]] (EXP 257 (EXP 255 31)) [[ 8 ]] (EXP 257 (EXP 257 31)) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 (EXP 256 31)) [[ 1 ]] (EXP 256 (EXP 255 31)) [[ 2 ]] (EXP 256 (EXP 257 31)) [[ 3 ]] (EXP 255 (EXP 256 31)) [[ 4 ]] (EXP 255 (EXP 255 31)) [[ 5 ]] (EXP 255 (EXP 257 31)) [[ 6 ]] (EXP 257 (EXP 256 31)) [[ 7 ]] (EXP 257 (EXP 255 31)) [[ 8 ]] (EXP 257 (EXP 257 31)) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_32Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_32Filler.json
index 7c74a3913..51302b6b5 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_32Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_32Filler.json
@@ -1,42 +1,42 @@
 {
     "expPowerOf256Of256_32": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "10000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x" : "0x01",
-                    "0x03" : "0x01",
-                    "0x04" : "0xb8247842bb5ce75c08d0c251669ed5870fa24a22952e5db3a7c66c59ffe000ff",
-                    "0x05" : "0xee526e5a06f2a990b2bf6c951e5feabf0e07ee16877296e1be872db9e02000ff",
-                    "0x06" : "0x01",
-                    "0x07" : "0xeda7d024b6de40a9d3b966e71f10a4667edc5b71cab07aeabcac6249dfe00101",
-                    "0x08" : "0x512ecfaeeb11205f0833e1054dcb1300488e0954be5af77a49e143aa00200101"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01",
+                    "0x03": "0x01",
+                    "0x04": "0xb8247842bb5ce75c08d0c251669ed5870fa24a22952e5db3a7c66c59ffe000ff",
+                    "0x05": "0xee526e5a06f2a990b2bf6c951e5feabf0e07ee16877296e1be872db9e02000ff",
+                    "0x06": "0x01",
+                    "0x07": "0xeda7d024b6de40a9d3b966e71f10a4667edc5b71cab07aeabcac6249dfe00101",
+                    "0x08": "0x512ecfaeeb11205f0833e1054dcb1300488e0954be5af77a49e143aa00200101"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 (EXP 256 32)) [[ 1 ]] (EXP 256 (EXP 255 32)) [[ 2 ]] (EXP 256 (EXP 257 32)) [[ 3 ]] (EXP 255 (EXP 256 32)) [[ 4 ]] (EXP 255 (EXP 255 32)) [[ 5 ]] (EXP 255 (EXP 257 32)) [[ 6 ]] (EXP 257 (EXP 256 32)) [[ 7 ]] (EXP 257 (EXP 255 32)) [[ 8 ]] (EXP 257 (EXP 257 32)) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 (EXP 256 32)) [[ 1 ]] (EXP 256 (EXP 255 32)) [[ 2 ]] (EXP 256 (EXP 257 32)) [[ 3 ]] (EXP 255 (EXP 256 32)) [[ 4 ]] (EXP 255 (EXP 255 32)) [[ 5 ]] (EXP 255 (EXP 257 32)) [[ 6 ]] (EXP 257 (EXP 256 32)) [[ 7 ]] (EXP 257 (EXP 255 32)) [[ 8 ]] (EXP 257 (EXP 257 32)) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_33Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_33Filler.json
index aa87e78a9..9db432186 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_33Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_33Filler.json
@@ -1,42 +1,42 @@
 {
     "expPowerOf256Of256_33": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "10000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x" : "0x01",
-                    "0x03" : "0x01",
-                    "0x04" : "0x8dcb65b5494eba78cd6756a6f9851f6e26d0f2bb9ecd7e9abd7e9b11209ffeff",
-                    "0x05" : "0x6694bb31b20cd625f3756897dae6d738f2e64467b5b6f10fa3e07763ffa100ff",
-                    "0x06" : "0x01",
-                    "0x07" : "0xe678999aeffd1f1f45081f64de7f80ab083dd7df04721ed64ee04c03bda1ff01",
-                    "0x08" : "0x39b68fb9898dd7568abd178397251ce8226a25c1d305a4e79573333520a10101"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01",
+                    "0x03": "0x01",
+                    "0x04": "0x8dcb65b5494eba78cd6756a6f9851f6e26d0f2bb9ecd7e9abd7e9b11209ffeff",
+                    "0x05": "0x6694bb31b20cd625f3756897dae6d738f2e64467b5b6f10fa3e07763ffa100ff",
+                    "0x06": "0x01",
+                    "0x07": "0xe678999aeffd1f1f45081f64de7f80ab083dd7df04721ed64ee04c03bda1ff01",
+                    "0x08": "0x39b68fb9898dd7568abd178397251ce8226a25c1d305a4e79573333520a10101"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 (EXP 256 33)) [[ 1 ]] (EXP 256 (EXP 255 33)) [[ 2 ]] (EXP 256 (EXP 257 33)) [[ 3 ]] (EXP 255 (EXP 256 33)) [[ 4 ]] (EXP 255 (EXP 255 33)) [[ 5 ]] (EXP 255 (EXP 257 33)) [[ 6 ]] (EXP 257 (EXP 256 33)) [[ 7 ]] (EXP 257 (EXP 255 33)) [[ 8 ]] (EXP 257 (EXP 257 33)) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 (EXP 256 33)) [[ 1 ]] (EXP 256 (EXP 255 33)) [[ 2 ]] (EXP 256 (EXP 257 33)) [[ 3 ]] (EXP 255 (EXP 256 33)) [[ 4 ]] (EXP 255 (EXP 255 33)) [[ 5 ]] (EXP 255 (EXP 257 33)) [[ 6 ]] (EXP 257 (EXP 256 33)) [[ 7 ]] (EXP 257 (EXP 255 33)) [[ 8 ]] (EXP 257 (EXP 257 33)) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_3Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_3Filler.json
index 0a00da889..fa17b72be 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_3Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_3Filler.json
@@ -1,41 +1,41 @@
 {
     "expPowerOf256Of256_3": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "10000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x03" : "0x109a00e1370d2d2922bf892e85becb54297354b2e5c75388d514ff7f00000001",
-                    "0x04" : "0x54a792f15e9aba7e4ad9e716bc169eea3a6e2e9c49bf9b335874613c8081feff",
-                    "0x05" : "0x5d24a14d8e5e039372cd0f6a0f31e9ed6b75adba9f16b1c5b3edd5ba818300ff",
-                    "0x06" : "0x298e2f316b4ccded5ebf515998d9ec20df69404b04a441782a6aff8100000001",
-                    "0x07" : "0x4335694e98f372183c62a2339fa4ad161e9b4c42240bdc9452abffd07783ff01",
-                    "0x08" : "0xf0f0820797315acd063056bba76f6a9c3e281cdb5197a233967ca94684830101"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x109a00e1370d2d2922bf892e85becb54297354b2e5c75388d514ff7f00000001",
+                    "0x04": "0x54a792f15e9aba7e4ad9e716bc169eea3a6e2e9c49bf9b335874613c8081feff",
+                    "0x05": "0x5d24a14d8e5e039372cd0f6a0f31e9ed6b75adba9f16b1c5b3edd5ba818300ff",
+                    "0x06": "0x298e2f316b4ccded5ebf515998d9ec20df69404b04a441782a6aff8100000001",
+                    "0x07": "0x4335694e98f372183c62a2339fa4ad161e9b4c42240bdc9452abffd07783ff01",
+                    "0x08": "0xf0f0820797315acd063056bba76f6a9c3e281cdb5197a233967ca94684830101"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 (EXP 256 3)) [[ 1 ]] (EXP 256 (EXP 255 3)) [[ 2 ]] (EXP 256 (EXP 257 3)) [[ 3 ]] (EXP 255 (EXP 256 3)) [[ 4 ]] (EXP 255 (EXP 255 3)) [[ 5 ]] (EXP 255 (EXP 257 3)) [[ 6 ]] (EXP 257 (EXP 256 3)) [[ 7 ]] (EXP 257 (EXP 255 3)) [[ 8 ]] (EXP 257 (EXP 257 3)) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 (EXP 256 3)) [[ 1 ]] (EXP 256 (EXP 255 3)) [[ 2 ]] (EXP 256 (EXP 257 3)) [[ 3 ]] (EXP 255 (EXP 256 3)) [[ 4 ]] (EXP 255 (EXP 255 3)) [[ 5 ]] (EXP 255 (EXP 257 3)) [[ 6 ]] (EXP 257 (EXP 256 3)) [[ 7 ]] (EXP 257 (EXP 255 3)) [[ 8 ]] (EXP 257 (EXP 257 3)) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_4Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_4Filler.json
index 97295ba81..433c8f1ca 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_4Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_4Filler.json
@@ -1,41 +1,41 @@
 {
     "expPowerOf256Of256_4": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "10000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x03" : "0xe6540ce46eaf70da9d644015a661e0e245b13f307cb3885514ff7f0000000001",
-                    "0x04" : "0x6526b38b05a6325b80e1c84ab41dc934fd70f33f1bd0eab3d1f61a4707fc00ff",
-                    "0x05" : "0xe959516cd27e5d8fd487b72db2989b3ec2ba9fb7ead41554526fe5a3040400ff",
-                    "0x06" : "0xe7498a48c6ce2530bbe814ee3440c8c44fffab7ad8a277aa6aff810000000001",
-                    "0x07" : "0x2dffa3e901e5a392d15b79f4193d2168147d2aa7c55870b46c3a905d03fc0101",
-                    "0x08" : "0xe16ea721c96539edb4f7fb82de0dad8cccb1e7a6966a6777635f6fb908040101"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0xe6540ce46eaf70da9d644015a661e0e245b13f307cb3885514ff7f0000000001",
+                    "0x04": "0x6526b38b05a6325b80e1c84ab41dc934fd70f33f1bd0eab3d1f61a4707fc00ff",
+                    "0x05": "0xe959516cd27e5d8fd487b72db2989b3ec2ba9fb7ead41554526fe5a3040400ff",
+                    "0x06": "0xe7498a48c6ce2530bbe814ee3440c8c44fffab7ad8a277aa6aff810000000001",
+                    "0x07": "0x2dffa3e901e5a392d15b79f4193d2168147d2aa7c55870b46c3a905d03fc0101",
+                    "0x08": "0xe16ea721c96539edb4f7fb82de0dad8cccb1e7a6966a6777635f6fb908040101"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 (EXP 256 4)) [[ 1 ]] (EXP 256 (EXP 255 4)) [[ 2 ]] (EXP 256 (EXP 257 4)) [[ 3 ]] (EXP 255 (EXP 256 4)) [[ 4 ]] (EXP 255 (EXP 255 4)) [[ 5 ]] (EXP 255 (EXP 257 4)) [[ 6 ]] (EXP 257 (EXP 256 4)) [[ 7 ]] (EXP 257 (EXP 255 4)) [[ 8 ]] (EXP 257 (EXP 257 4)) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 (EXP 256 4)) [[ 1 ]] (EXP 256 (EXP 255 4)) [[ 2 ]] (EXP 256 (EXP 257 4)) [[ 3 ]] (EXP 255 (EXP 256 4)) [[ 4 ]] (EXP 255 (EXP 255 4)) [[ 5 ]] (EXP 255 (EXP 257 4)) [[ 6 ]] (EXP 257 (EXP 256 4)) [[ 7 ]] (EXP 257 (EXP 255 4)) [[ 8 ]] (EXP 257 (EXP 257 4)) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_5Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_5Filler.json
index e00c08292..4def23243 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_5Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_5Filler.json
@@ -1,41 +1,41 @@
 {
     "expPowerOf256Of256_5": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "10000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x03" : "0xb581ac185aad71db2d177c286929c4c22809e5dcb3085514ff7f000000000001",
-                    "0x04" : "0x75789eb2a64bc971389fbd11a1e6d7abbf95ad25e23fb9aa25e73a0bfc83feff",
-                    "0x05" : "0xfc403fa42ceb6a0d0d3321bd9b2d8af25b1b667f87a04f496c78168d078500ff",
-                    "0x06" : "0xcec5ec213b9cb5811f6ae00428fd7b6ef5a1af39a1f7aa6aff81000000000001",
-                    "0x07" : "0x70ab32233202b98d382d17713fa0be391eaf74f85ba1740c9c3238c4ed85ff01",
-                    "0x08" : "0xb622672a213faa79b32185ff93a7b27a8499e48f7b032cdb4d1a70300c850101"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0xb581ac185aad71db2d177c286929c4c22809e5dcb3085514ff7f000000000001",
+                    "0x04": "0x75789eb2a64bc971389fbd11a1e6d7abbf95ad25e23fb9aa25e73a0bfc83feff",
+                    "0x05": "0xfc403fa42ceb6a0d0d3321bd9b2d8af25b1b667f87a04f496c78168d078500ff",
+                    "0x06": "0xcec5ec213b9cb5811f6ae00428fd7b6ef5a1af39a1f7aa6aff81000000000001",
+                    "0x07": "0x70ab32233202b98d382d17713fa0be391eaf74f85ba1740c9c3238c4ed85ff01",
+                    "0x08": "0xb622672a213faa79b32185ff93a7b27a8499e48f7b032cdb4d1a70300c850101"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 (EXP 256 5)) [[ 1 ]] (EXP 256 (EXP 255 5)) [[ 2 ]] (EXP 256 (EXP 257 5)) [[ 3 ]] (EXP 255 (EXP 256 5)) [[ 4 ]] (EXP 255 (EXP 255 5)) [[ 5 ]] (EXP 255 (EXP 257 5)) [[ 6 ]] (EXP 257 (EXP 256 5)) [[ 7 ]] (EXP 257 (EXP 255 5)) [[ 8 ]] (EXP 257 (EXP 257 5)) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 (EXP 256 5)) [[ 1 ]] (EXP 256 (EXP 255 5)) [[ 2 ]] (EXP 256 (EXP 257 5)) [[ 3 ]] (EXP 255 (EXP 256 5)) [[ 4 ]] (EXP 255 (EXP 255 5)) [[ 5 ]] (EXP 255 (EXP 257 5)) [[ 6 ]] (EXP 257 (EXP 256 5)) [[ 7 ]] (EXP 257 (EXP 255 5)) [[ 8 ]] (EXP 257 (EXP 257 5)) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_6Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_6Filler.json
index 714602c97..4d8ac3291 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_6Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_6Filler.json
@@ -1,41 +1,41 @@
 {
     "expPowerOf256Of256_6": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "10000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x03" : "0x1948059de1def03c4ec35fc22c2bb8f2bf45dc33085514ff7f00000000000001",
-                    "0x04" : "0x41f818a8e24eb6d7bb7b193b4f2b5fdcf4bd0d453f2ac3499d8830d391fa00ff",
-                    "0x05" : "0xede6fe4a943dfb5d967a2b85d6728759d40d2ef0ae4bc28bbb1867f98c0600ff",
-                    "0x06" : "0x083c936cbaad5de592badc2e142fe4ebd6103921f7aa6aff8100000000000001",
-                    "0x07" : "0x57385019fe4e0939ca3f35c37cadfaf52fba5b1cdfb02def3866e8068bfa0101",
-                    "0x08" : "0x810ac878bd98428f6be8c6426ba9f9da09e3e33bf4fe10bfa3f8b12c92060101"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x1948059de1def03c4ec35fc22c2bb8f2bf45dc33085514ff7f00000000000001",
+                    "0x04": "0x41f818a8e24eb6d7bb7b193b4f2b5fdcf4bd0d453f2ac3499d8830d391fa00ff",
+                    "0x05": "0xede6fe4a943dfb5d967a2b85d6728759d40d2ef0ae4bc28bbb1867f98c0600ff",
+                    "0x06": "0x083c936cbaad5de592badc2e142fe4ebd6103921f7aa6aff8100000000000001",
+                    "0x07": "0x57385019fe4e0939ca3f35c37cadfaf52fba5b1cdfb02def3866e8068bfa0101",
+                    "0x08": "0x810ac878bd98428f6be8c6426ba9f9da09e3e33bf4fe10bfa3f8b12c92060101"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 (EXP 256 6)) [[ 1 ]] (EXP 256 (EXP 255 6)) [[ 2 ]] (EXP 256 (EXP 257 6)) [[ 3 ]] (EXP 255 (EXP 256 6)) [[ 4 ]] (EXP 255 (EXP 255 6)) [[ 5 ]] (EXP 255 (EXP 257 6)) [[ 6 ]] (EXP 257 (EXP 256 6)) [[ 7 ]] (EXP 257 (EXP 255 6)) [[ 8 ]] (EXP 257 (EXP 257 6)) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 (EXP 256 6)) [[ 1 ]] (EXP 256 (EXP 255 6)) [[ 2 ]] (EXP 256 (EXP 257 6)) [[ 3 ]] (EXP 255 (EXP 256 6)) [[ 4 ]] (EXP 255 (EXP 255 6)) [[ 5 ]] (EXP 255 (EXP 257 6)) [[ 6 ]] (EXP 257 (EXP 256 6)) [[ 7 ]] (EXP 257 (EXP 255 6)) [[ 8 ]] (EXP 257 (EXP 257 6)) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_7Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_7Filler.json
index 56a089392..58fa19ba8 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_7Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_7Filler.json
@@ -1,41 +1,41 @@
 {
     "expPowerOf256Of256_7": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "10000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x03" : "0x8bb02654111ad8c60ad8af132283a81f455c33085514ff7f0000000000000001",
-                    "0x04" : "0xa8f75c129dbb8466d6703a2a0b8212131b3248d70e2478862ac40fe17485feff",
-                    "0x05" : "0x5fd4d2de580383ee59f5e800ddb3f1717ceae03aede19d3dec5e5a69918700ff",
-                    "0x06" : "0xc8624230b524b85d6340da48a5db20370fb921f7aa6aff810000000000000001",
-                    "0x07" : "0x287b58a5a13cd7f454468ca616c181712f5ed25433a7d5a894b6ced35f87ff01",
-                    "0x08" : "0x09930d11ac2804fa977bf951593c8dff8498779cc0cdc5812a4fba2f98870101"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x8bb02654111ad8c60ad8af132283a81f455c33085514ff7f0000000000000001",
+                    "0x04": "0xa8f75c129dbb8466d6703a2a0b8212131b3248d70e2478862ac40fe17485feff",
+                    "0x05": "0x5fd4d2de580383ee59f5e800ddb3f1717ceae03aede19d3dec5e5a69918700ff",
+                    "0x06": "0xc8624230b524b85d6340da48a5db20370fb921f7aa6aff810000000000000001",
+                    "0x07": "0x287b58a5a13cd7f454468ca616c181712f5ed25433a7d5a894b6ced35f87ff01",
+                    "0x08": "0x09930d11ac2804fa977bf951593c8dff8498779cc0cdc5812a4fba2f98870101"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 (EXP 256 7)) [[ 1 ]] (EXP 256 (EXP 255 7)) [[ 2 ]] (EXP 256 (EXP 257 7)) [[ 3 ]] (EXP 255 (EXP 256 7)) [[ 4 ]] (EXP 255 (EXP 255 7)) [[ 5 ]] (EXP 255 (EXP 257 7)) [[ 6 ]] (EXP 257 (EXP 256 7)) [[ 7 ]] (EXP 257 (EXP 255 7)) [[ 8 ]] (EXP 257 (EXP 257 7)) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 (EXP 256 7)) [[ 1 ]] (EXP 256 (EXP 255 7)) [[ 2 ]] (EXP 256 (EXP 257 7)) [[ 3 ]] (EXP 255 (EXP 256 7)) [[ 4 ]] (EXP 255 (EXP 255 7)) [[ 5 ]] (EXP 255 (EXP 257 7)) [[ 6 ]] (EXP 257 (EXP 256 7)) [[ 7 ]] (EXP 257 (EXP 255 7)) [[ 8 ]] (EXP 257 (EXP 257 7)) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_8Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_8Filler.json
index fbdc8be39..a9ad08a42 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_8Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_8Filler.json
@@ -1,41 +1,41 @@
 {
     "expPowerOf256Of256_8": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "100000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "100000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x03" : "0x230041a0e7602d6e459609ed39081ec55c33085514ff7f000000000000000001",
-                    "0x04" : "0xc407d8a413ef9079ead457ed686a05ac81039c0cae0a7f6afd01e8461ff800ff",
-                    "0x05" : "0x67a397e0692385e4cd83853aabce220a94d449e885fa867e96d3ef5e180800ff",
-                    "0x06" : "0x70add926e753655d6d0ebe9c0f81368fb921f7aa6aff81000000000000000001",
-                    "0x07" : "0x0bdce80b8378e43f13d454b9d0a4c83cf311b8eaa45d5122cfd544a217f80101",
-                    "0x08" : "0x629c25790e1488998877a9ecdf0fb69637e77d8a4bdc1b46270093ba20080101"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "10000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x230041a0e7602d6e459609ed39081ec55c33085514ff7f000000000000000001",
+                    "0x04": "0xc407d8a413ef9079ead457ed686a05ac81039c0cae0a7f6afd01e8461ff800ff",
+                    "0x05": "0x67a397e0692385e4cd83853aabce220a94d449e885fa867e96d3ef5e180800ff",
+                    "0x06": "0x70add926e753655d6d0ebe9c0f81368fb921f7aa6aff81000000000000000001",
+                    "0x07": "0x0bdce80b8378e43f13d454b9d0a4c83cf311b8eaa45d5122cfd544a217f80101",
+                    "0x08": "0x629c25790e1488998877a9ecdf0fb69637e77d8a4bdc1b46270093ba20080101"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 (EXP 256 8)) [[ 1 ]] (EXP 256 (EXP 255 8)) [[ 2 ]] (EXP 256 (EXP 257 8)) [[ 3 ]] (EXP 255 (EXP 256 8)) [[ 4 ]] (EXP 255 (EXP 255 8)) [[ 5 ]] (EXP 255 (EXP 257 8)) [[ 6 ]] (EXP 257 (EXP 256 8)) [[ 7 ]] (EXP 257 (EXP 255 8)) [[ 8 ]] (EXP 257 (EXP 257 8)) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "10000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 (EXP 256 8)) [[ 1 ]] (EXP 256 (EXP 255 8)) [[ 2 ]] (EXP 256 (EXP 257 8)) [[ 3 ]] (EXP 255 (EXP 256 8)) [[ 4 ]] (EXP 255 (EXP 255 8)) [[ 5 ]] (EXP 255 (EXP 257 8)) [[ 6 ]] (EXP 257 (EXP 256 8)) [[ 7 ]] (EXP 257 (EXP 255 8)) [[ 8 ]] (EXP 257 (EXP 257 8)) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_9Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_9Filler.json
index 0aab2ff59..002a5046d 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_9Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256Of256_9Filler.json
@@ -1,41 +1,41 @@
 {
     "expPowerOf256Of256_9": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "10000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x03" : "0x53017d8eb210db2c8cd4a299079ec55c33085514ff7f00000000000000000001",
-                    "0x04" : "0x48be09b6c6ae2aa660f1972125cecbb1038b5d236ecf766ba786e2c4e887feff",
-                    "0x05" : "0x2e350d847ba73dc2099f83f532951c47269d9fd7e411b50bae00a9581f8900ff",
-                    "0x06" : "0x013ab9e1f0df89a184b4d07080b68fb921f7aa6aff8100000000000000000001",
-                    "0x07" : "0xf387ed41c1050f9da667f429a3e8fb30b61a55ede97d7b8acd797a03cd89ff01",
-                    "0x08" : "0x525696c22bb3ce00fd2e3f6bbb9b4ea1046a5e31fcff2fedf8f8c74d28890101"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x53017d8eb210db2c8cd4a299079ec55c33085514ff7f00000000000000000001",
+                    "0x04": "0x48be09b6c6ae2aa660f1972125cecbb1038b5d236ecf766ba786e2c4e887feff",
+                    "0x05": "0x2e350d847ba73dc2099f83f532951c47269d9fd7e411b50bae00a9581f8900ff",
+                    "0x06": "0x013ab9e1f0df89a184b4d07080b68fb921f7aa6aff8100000000000000000001",
+                    "0x07": "0xf387ed41c1050f9da667f429a3e8fb30b61a55ede97d7b8acd797a03cd89ff01",
+                    "0x08": "0x525696c22bb3ce00fd2e3f6bbb9b4ea1046a5e31fcff2fedf8f8c74d28890101"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 (EXP 256 9)) [[ 1 ]] (EXP 256 (EXP 255 9)) [[ 2 ]] (EXP 256 (EXP 257 9)) [[ 3 ]] (EXP 255 (EXP 256 9)) [[ 4 ]] (EXP 255 (EXP 255 9)) [[ 5 ]] (EXP 255 (EXP 257 9)) [[ 6 ]] (EXP 257 (EXP 256 9)) [[ 7 ]] (EXP 257 (EXP 255 9)) [[ 8 ]] (EXP 257 (EXP 257 9)) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 (EXP 256 9)) [[ 1 ]] (EXP 256 (EXP 255 9)) [[ 2 ]] (EXP 256 (EXP 257 9)) [[ 3 ]] (EXP 255 (EXP 256 9)) [[ 4 ]] (EXP 255 (EXP 255 9)) [[ 5 ]] (EXP 255 (EXP 257 9)) [[ 6 ]] (EXP 257 (EXP 256 9)) [[ 7 ]] (EXP 257 (EXP 255 9)) [[ 8 ]] (EXP 257 (EXP 257 9)) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_10Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_10Filler.json
index 2b11a5275..a4ee68743 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_10Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_10Filler.json
@@ -1,38 +1,38 @@
 {
     "expPowerOf256_10": {
-        "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" : "0x0100000000000000000000",
-                    "0x01" : "0xf62c88d104d1882cf601",
-                    "0x02" : "0x010a2d78d2fcd2782d0a01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x0100000000000000000000",
+                    "0x01": "0xf62c88d104d1882cf601",
+                    "0x02": "0x010a2d78d2fcd2782d0a01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 10) [[ 1 ]] (EXP 255 10) [[ 2 ]] (EXP 257 10) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 10) [[ 1 ]] (EXP 255 10) [[ 2 ]] (EXP 257 10) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_11Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_11Filler.json
index 29f2fe0e1..56fdf63e4 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_11Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_11Filler.json
@@ -1,38 +1,38 @@
 {
     "expPowerOf256_11": {
-        "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" : "0x010000000000000000000000",
-                    "0x01" : "0xf5365c4833ccb6a4c90aff",
-                    "0x02" : "0x010b37a64bcfcf4aa5370b01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x010000000000000000000000",
+                    "0x01": "0xf5365c4833ccb6a4c90aff",
+                    "0x02": "0x010b37a64bcfcf4aa5370b01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 11) [[ 1 ]] (EXP 255 11) [[ 2 ]] (EXP 257 11) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 11) [[ 1 ]] (EXP 255 11) [[ 2 ]] (EXP 257 11) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_12Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_12Filler.json
index 29c748639..91d79359e 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_12Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_12Filler.json
@@ -1,38 +1,38 @@
 {
     "expPowerOf256_12": {
-        "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" : "0x01000000000000000000000000",
-                    "0x01" : "0xf44125ebeb98e9ee2441f401",
-                    "0x02" : "0x010c42ddf21b9f19efdc420c01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01000000000000000000000000",
+                    "0x01": "0xf44125ebeb98e9ee2441f401",
+                    "0x02": "0x010c42ddf21b9f19efdc420c01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 12) [[ 1 ]] (EXP 255 12) [[ 2 ]] (EXP 257 12) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 12) [[ 1 ]] (EXP 255 12) [[ 2 ]] (EXP 257 12) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_13Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_13Filler.json
index 98e205953..393f2aed1 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_13Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_13Filler.json
@@ -1,38 +1,38 @@
 {
     "expPowerOf256_13": {
-        "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" : "0x0100000000000000000000000000",
-                    "0x01" : "0xf34ce4c5ffad5104361db20cff",
-                    "0x02" : "0x010d4f20d00dbab909cc1e4e0d01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x0100000000000000000000000000",
+                    "0x01": "0xf34ce4c5ffad5104361db20cff",
+                    "0x02": "0x010d4f20d00dbab909cc1e4e0d01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 13) [[ 1 ]] (EXP 255 13) [[ 2 ]] (EXP 257 13) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 13) [[ 1 ]] (EXP 255 13) [[ 2 ]] (EXP 257 13) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_14Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_14Filler.json
index 3defc5b99..54fbe50ec 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_14Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_14Filler.json
@@ -1,38 +1,38 @@
 {
     "expPowerOf256_14": {
-        "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" : "0x010000000000000000000000000000",
-                    "0x01" : "0xf25997e139ada3b331e7945af201",
-                    "0x02" : "0x010e5c6ff0ddc873c2d5ea6c5b0e01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x010000000000000000000000000000",
+                    "0x01": "0xf25997e139ada3b331e7945af201",
+                    "0x02": "0x010e5c6ff0ddc873c2d5ea6c5b0e01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 14) [[ 1 ]] (EXP 255 14) [[ 2 ]] (EXP 257 14) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 14) [[ 1 ]] (EXP 255 14) [[ 2 ]] (EXP 257 14) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_15Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_15Filler.json
index 643e8d1ac..7213273de 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_15Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_15Filler.json
@@ -1,38 +1,38 @@
 {
     "expPowerOf256_15": {
-        "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" : "0x01000000000000000000000000000000",
-                    "0x01" : "0xf1673e495873f60f7eb5acc6970eff",
-                    "0x02" : "0x010f6acc60cea63c3698c056c7690f01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01000000000000000000000000000000",
+                    "0x01": "0xf1673e495873f60f7eb5acc6970eff",
+                    "0x02": "0x010f6acc60cea63c3698c056c7690f01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 15) [[ 1 ]] (EXP 255 15) [[ 2 ]] (EXP 257 15) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 15) [[ 1 ]] (EXP 255 15) [[ 2 ]] (EXP 257 15) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_16Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_16Filler.json
index 3e568f8aa..f9c0020b1 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_16Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_16Filler.json
@@ -1,38 +1,38 @@
 {
     "expPowerOf256_16": {
-        "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" : "0x0100000000000000000000000000000000",
-                    "0x01" : "0xf075d70b0f1b82196f36f719d077f001",
-                    "0x02" : "0x01107a372d2f74e272cf59171e30781001"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x0100000000000000000000000000000000",
+                    "0x01": "0xf075d70b0f1b82196f36f719d077f001",
+                    "0x02": "0x01107a372d2f74e272cf59171e30781001"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 16) [[ 1 ]] (EXP 255 16) [[ 2 ]] (EXP 257 16) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 16) [[ 1 ]] (EXP 255 16) [[ 2 ]] (EXP 257 16) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_17Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_17Filler.json
index ce01401a2..0beb76766 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_17Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_17Filler.json
@@ -1,38 +1,38 @@
 {
     "expPowerOf256_17": {
-        "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" : "0x010000000000000000000000000000000000",
-                    "0x01" : "0xef856134040c669755c7c022b6a77810ff",
-                    "0x02" : "0x01118ab1645ca45755422870354ea8881101"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x010000000000000000000000000000000000",
+                    "0x01": "0xef856134040c669755c7c022b6a77810ff",
+                    "0x02": "0x01118ab1645ca45755422870354ea8881101"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 17) [[ 1 ]] (EXP 255 17) [[ 2 ]] (EXP 257 17) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 17) [[ 1 ]] (EXP 255 17) [[ 2 ]] (EXP 257 17) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_18Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_18Filler.json
index b61833550..5d106b14e 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_18Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_18Filler.json
@@ -1,38 +1,38 @@
 {
     "expPowerOf256_18": {
-        "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" : "0x01000000000000000000000000000000000000",
-                    "0x01" : "0xee95dbd2d0085a30be71f86293f0d098ee01",
-                    "0x02" : "0x01129c3c15c100fbac976a98a583f730991201"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01000000000000000000000000000000000000",
+                    "0x01": "0xee95dbd2d0085a30be71f86293f0d098ee01",
+                    "0x02": "0x01129c3c15c100fbac976a98a583f730991201"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 18) [[ 1 ]] (EXP 255 18) [[ 2 ]] (EXP 257 18) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 18) [[ 1 ]] (EXP 255 18) [[ 2 ]] (EXP 257 18) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_19Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_19Filler.json
index 4ee97d62b..19a188a90 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_19Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_19Filler.json
@@ -1,38 +1,38 @@
 {
     "expPowerOf256_19": {
-        "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" : "0x0100000000000000000000000000000000000000",
-                    "0x01" : "0xeda745f6fd3851d68db3866a315cdfc85512ff",
-                    "0x02" : "0x0113aed851d6c1fca84402033e297b27c9ab1301"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x0100000000000000000000000000000000000000",
+                    "0x01": "0xeda745f6fd3851d68db3866a315cdfc85512ff",
+                    "0x02": "0x0113aed851d6c1fca84402033e297b27c9ab1301"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 19) [[ 1 ]] (EXP 255 19) [[ 2 ]] (EXP 257 19) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 19) [[ 1 ]] (EXP 255 19) [[ 2 ]] (EXP 257 19) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_1Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_1Filler.json
index 98fe1128b..7afd0ee74 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_1Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_1Filler.json
@@ -1,38 +1,38 @@
 {
     "expPowerOf256_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" : "0x0100",
-                    "0x01" : "0xff",
-                    "0x02" : "0x0101"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x0100",
+                    "0x01": "0xff",
+                    "0x02": "0x0101"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 1) [[ 1 ]] (EXP 255 1) [[ 2 ]] (EXP 257 1) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 1) [[ 1 ]] (EXP 255 1) [[ 2 ]] (EXP 257 1) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_20Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_20Filler.json
index b0f71fa31..302ccc27c 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_20Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_20Filler.json
@@ -1,38 +1,38 @@
 {
     "expPowerOf256_20": {
-        "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" : "0x010000000000000000000000000000000000000000",
-                    "0x01" : "0xecb99eb1063b1984b725d2e3c72b82e88cbdec01",
-                    "0x02" : "0x0114c2872a2898bea4ec46054167a4a2f174be1401"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x010000000000000000000000000000000000000000",
+                    "0x01": "0xecb99eb1063b1984b725d2e3c72b82e88cbdec01",
+                    "0x02": "0x0114c2872a2898bea4ec46054167a4a2f174be1401"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 20) [[ 1 ]] (EXP 255 20) [[ 2 ]] (EXP 257 20) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 20) [[ 1 ]] (EXP 255 20) [[ 2 ]] (EXP 257 20) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_21Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_21Filler.json
index 1732a7334..cd4d43213 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_21Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_21Filler.json
@@ -1,38 +1,38 @@
 {
     "expPowerOf256_21": {
-        "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" : "0x01000000000000000000000000000000000000000000",
-                    "0x01" : "0xebcce5125534de6b326ead10e3645765a4312e14ff",
-                    "0x02" : "0x0115d749b152c1576391324b46a90c47946632d21501"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01000000000000000000000000000000000000000000",
+                    "0x01": "0xebcce5125534de6b326ead10e3645765a4312e14ff",
+                    "0x02": "0x0115d749b152c1576391324b46a90c47946632d21501"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 21) [[ 1 ]] (EXP 255 21) [[ 2 ]] (EXP 257 21) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 21) [[ 1 ]] (EXP 255 21) [[ 2 ]] (EXP 257 21) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_22Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_22Filler.json
index 671802158..5d48f536a 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_22Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_22Filler.json
@@ -1,38 +1,38 @@
 {
     "expPowerOf256_22": {
-        "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" : "0x0100000000000000000000000000000000000000000000",
-                    "0x01" : "0xeae1182d42dfa98cc73c3e63d280f30e3e8cfce6ea01",
-                    "0x02" : "0x0116ed20fb041418baf4c37d91efb553dbfa9904e71601"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x0100000000000000000000000000000000000000000000",
+                    "0x01": "0xeae1182d42dfa98cc73c3e63d280f30e3e8cfce6ea01",
+                    "0x02": "0x0116ed20fb041418baf4c37d91efb553dbfa9904e71601"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 22) [[ 1 ]] (EXP 255 22) [[ 2 ]] (EXP 257 22) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 22) [[ 1 ]] (EXP 255 22) [[ 2 ]] (EXP 257 22) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_23Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_23Filler.json
index 5bd0a995e..a6590490f 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_23Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_23Filler.json
@@ -1,38 +1,38 @@
 {
     "expPowerOf256_23": {
-        "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" : "0x010000000000000000000000000000000000000000000000",
-                    "0x01" : "0xe9f63715159cc9e33a7502256eae721b304e6fea0316ff",
-                    "0x02" : "0x0118040e1bff182cd3afb8410f81a5092fd6939debfd1701"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x010000000000000000000000000000000000000000000000",
+                    "0x01": "0xe9f63715159cc9e33a7502256eae721b304e6fea0316ff",
+                    "0x02": "0x0118040e1bff182cd3afb8410f81a5092fd6939debfd1701"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 23) [[ 1 ]] (EXP 255 23) [[ 2 ]] (EXP 257 23) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 23) [[ 1 ]] (EXP 255 23) [[ 2 ]] (EXP 257 23) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_24Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_24Filler.json
index c2d25e738..10dbb3ad3 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_24Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_24Filler.json
@@ -1,38 +1,38 @@
 {
     "expPowerOf256_24": {
-        "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" : "0x01000000000000000000000000000000000000000000000000",
-                    "0x01" : "0xe90c40de00872d19573a8d23493fc3a9151e217a1913e801",
-                    "0x02" : "0x01191c122a1b1745008367f9509126ae39066a3189e9141801"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01000000000000000000000000000000000000000000000000",
+                    "0x01": "0xe90c40de00872d19573a8d23493fc3a9151e217a1913e801",
+                    "0x02": "0x01191c122a1b1745008367f9509126ae39066a3189e9141801"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 24) [[ 1 ]] (EXP 255 24) [[ 2 ]] (EXP 257 24) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 24) [[ 1 ]] (EXP 255 24) [[ 2 ]] (EXP 257 24) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_25Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_25Filler.json
index 38011cf8c..e1d4ef408 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_25Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_25Filler.json
@@ -1,38 +1,38 @@
 {
     "expPowerOf256_25": {
-        "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" : "0x0100000000000000000000000000000000000000000000000000",
-                    "0x01" : "0xe823349d2286a5ec3de3529625f683e56c0903589efad418ff",
-                    "0x02" : "0x011a352e3c45325c4583eb6149e1b7d4e73f709bbb72fd2c1901"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x0100000000000000000000000000000000000000000000000000",
+                    "0x01": "0xe823349d2286a5ec3de3529625f683e56c0903589efad418ff",
+                    "0x02": "0x011a352e3c45325c4583eb6149e1b7d4e73f709bbb72fd2c1901"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 25) [[ 1 ]] (EXP 255 25) [[ 2 ]] (EXP 257 25) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 25) [[ 1 ]] (EXP 255 25) [[ 2 ]] (EXP 257 25) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_26Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_26Filler.json
index a72bb5774..10977a206 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_26Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_26Filler.json
@@ -1,38 +1,38 @@
 {
     "expPowerOf256_26": {
-        "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" : "0x010000000000000000000000000000000000000000000000000000",
-                    "0x01" : "0xe73b116885641f4651a56f438fd08d61869cfa55465bd944e601",
-                    "0x02" : "0x011b4f636a81778ea1c96f4cab2b998cbc26b00c572e7029451a01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x010000000000000000000000000000000000000000000000000000",
+                    "0x01": "0xe73b116885641f4651a56f438fd08d61869cfa55465bd944e601",
+                    "0x02": "0x011b4f636a81778ea1c96f4cab2b998cbc26b00c572e7029451a01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 26) [[ 1 ]] (EXP 255 26) [[ 2 ]] (EXP 257 26) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 26) [[ 1 ]] (EXP 255 26) [[ 2 ]] (EXP 257 26) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_27Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_27Filler.json
index f525e3476..93fd95582 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_27Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_27Filler.json
@@ -1,38 +1,38 @@
 {
     "expPowerOf256_27": {
-        "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" : "0x01000000000000000000000000000000000000000000000000000000",
-                    "0x01" : "0xe653d6571cdebb270b53c9d44c40bcd425165d5af1157d6ba11aff",
-                    "0x02" : "0x011c6ab2cdebf906306b38bbf7d6c52648e2d6bc63859e996e5f1b01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01000000000000000000000000000000000000000000000000000000",
+                    "0x01": "0xe653d6571cdebb270b53c9d44c40bcd425165d5af1157d6ba11aff",
+                    "0x02": "0x011c6ab2cdebf906306b38bbf7d6c52648e2d6bc63859e996e5f1b01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 27) [[ 1 ]] (EXP 255 27) [[ 2 ]] (EXP 257 27) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 27) [[ 1 ]] (EXP 255 27) [[ 2 ]] (EXP 257 27) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_28Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_28Filler.json
index 15a253eff..27e2d3ded 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_28Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_28Filler.json
@@ -1,38 +1,38 @@
 {
     "expPowerOf256_28": {
-        "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" : "0x0100000000000000000000000000000000000000000000000000000000",
-                    "0x01" : "0xe56d8280c5c1dc6be448760a77f47c1750f146fd962467ee3579e401",
-                    "0x02" : "0x011d871d80b9e4ff369ba3f4b3ce9beb6f2bb9931fe9243807cd7a1c01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x0100000000000000000000000000000000000000000000000000000000",
+                    "0x01": "0xe56d8280c5c1dc6be448760a77f47c1750f146fd962467ee3579e401",
+                    "0x02": "0x011d871d80b9e4ff369ba3f4b3ce9beb6f2bb9931fe9243807cd7a1c01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 28) [[ 1 ]] (EXP 255 28) [[ 2 ]] (EXP 257 28) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 28) [[ 1 ]] (EXP 255 28) [[ 2 ]] (EXP 257 28) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_29Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_29Filler.json
index 628c71aec..637564e9b 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_29Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_29Filler.json
@@ -1,38 +1,38 @@
 {
     "expPowerOf256_29": {
-        "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" : "0x010000000000000000000000000000000000000000000000000000000000",
-                    "0x01" : "0xe48814fe44fc1a8f78642d946d7c879b39a055b6988e438647446a1cff",
-                    "0x02" : "0x011ea4a49e3a9ee435d23f98a8826a875a9ae54cb3090d5c3fd547961d01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x010000000000000000000000000000000000000000000000000000000000",
+                    "0x01": "0xe48814fe44fc1a8f78642d946d7c879b39a055b6988e438647446a1cff",
+                    "0x02": "0x011ea4a49e3a9ee435d23f98a8826a875a9ae54cb3090d5c3fd547961d01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 29) [[ 1 ]] (EXP 255 29) [[ 2 ]] (EXP 257 29) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 29) [[ 1 ]] (EXP 255 29) [[ 2 ]] (EXP 257 29) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_2Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_2Filler.json
index bc3297cd6..8d21069b2 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_2Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_2Filler.json
@@ -1,38 +1,38 @@
 {
     "expPowerOf256_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"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x" : "0x010000",
-                    "0x01" : "0xfe01",
-                    "0x02" : "0x010201"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x010000",
+                    "0x01": "0xfe01",
+                    "0x02": "0x010201"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 2) [[ 1 ]] (EXP 255 2) [[ 2 ]] (EXP 257 2) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 2) [[ 1 ]] (EXP 255 2) [[ 2 ]] (EXP 257 2) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_30Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_30Filler.json
index bb0e4b5f7..a91e20443 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_30Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_30Filler.json
@@ -1,38 +1,38 @@
 {
     "expPowerOf256_30": {
-        "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" : "0x01000000000000000000000000000000000000000000000000000000000000",
-                    "0x01" : "0xe3a38ce946b71e74e8ebc966d90f0b139e66b560e1f5b542c0fd25b2e201",
-                    "0x02" : "0x011fc34942d8d9831a0811d8412aecf1e1f58031ffbc16699c151cddb31e01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01000000000000000000000000000000000000000000000000000000000000",
+                    "0x01": "0xe3a38ce946b71e74e8ebc966d90f0b139e66b560e1f5b542c0fd25b2e201",
+                    "0x02": "0x011fc34942d8d9831a0811d8412aecf1e1f58031ffbc16699c151cddb31e01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 30) [[ 1 ]] (EXP 255 30) [[ 2 ]] (EXP 257 30) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 30) [[ 1 ]] (EXP 255 30) [[ 2 ]] (EXP 257 30) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_31Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_31Filler.json
index 83b015989..e577f1caa 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_31Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_31Filler.json
@@ -1,38 +1,38 @@
 {
     "expPowerOf256_31": {
-        "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" : "0x0100000000000000000000000000000000000000000000000000000000000000",
-                    "0x01" : "0xe2bfe95c5d7067567402dd9d7235fc088ac84eab8113bf8d7e3c288d2f1eff",
-                    "0x02" : "0x0120e30c8c1bb25c9d2219ea196c17ded3d775b231bbd28005b131fa90d11f01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x0100000000000000000000000000000000000000000000000000000000000000",
+                    "0x01": "0xe2bfe95c5d7067567402dd9d7235fc088ac84eab8113bf8d7e3c288d2f1eff",
+                    "0x02": "0x0120e30c8c1bb25c9d2219ea196c17ded3d775b231bbd28005b131fa90d11f01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 31) [[ 1 ]] (EXP 255 31) [[ 2 ]] (EXP 257 31) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 31) [[ 1 ]] (EXP 255 31) [[ 2 ]] (EXP 257 31) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_32Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_32Filler.json
index 1c2a3bbc0..efebf5800 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_32Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_32Filler.json
@@ -1,37 +1,37 @@
 {
     "expPowerOf256_32": {
-        "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" : "0xe1dd29730112f6ef1d8edabfd4c3c60c823d865cd592abcdf0bdec64a1efe001",
-                    "0x02" : "0x2203ef98a7ce0ef9bf3c04038583f6b2ab4d27e3ed8e5285b6e32c8b61f02001"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x01": "0xe1dd29730112f6ef1d8edabfd4c3c60c823d865cd592abcdf0bdec64a1efe001",
+                    "0x02": "0x2203ef98a7ce0ef9bf3c04038583f6b2ab4d27e3ed8e5285b6e32c8b61f02001"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 32) [[ 1 ]] (EXP 255 32) [[ 2 ]] (EXP 257 32) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 32) [[ 1 ]] (EXP 255 32) [[ 2 ]] (EXP 257 32) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_33Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_33Filler.json
index 8b96086b7..039b2fdcc 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_33Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_33Filler.json
@@ -1,37 +1,37 @@
 {
     "expPowerOf256_33": {
-        "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" : "0xfb4c498e11e3f82e714be514ef024675bb48d678bd192222cd2e783d4df020ff",
-                    "0x02" : "0x25f3884075dd08b8fb400789097aa95df8750bd17be0d83c9a0fb7ed52102101"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x01": "0xfb4c498e11e3f82e714be514ef024675bb48d678bd192222cd2e783d4df020ff",
+                    "0x02": "0x25f3884075dd08b8fb400789097aa95df8750bd17be0d83c9a0fb7ed52102101"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 33) [[ 1 ]] (EXP 255 33) [[ 2 ]] (EXP 257 33) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 33) [[ 1 ]] (EXP 255 33) [[ 2 ]] (EXP 257 33) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_3Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_3Filler.json
index 420880703..e55b68cd4 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_3Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_3Filler.json
@@ -1,38 +1,38 @@
 {
     "expPowerOf256_3": {
-        "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" : "0x01000000",
-                    "0x01" : "0xfd02ff",
-                    "0x02" : "0x01030301"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01000000",
+                    "0x01": "0xfd02ff",
+                    "0x02": "0x01030301"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 3) [[ 1 ]] (EXP 255 3) [[ 2 ]] (EXP 257 3) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 3) [[ 1 ]] (EXP 255 3) [[ 2 ]] (EXP 257 3) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_4Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_4Filler.json
index 360d3dff2..a81882281 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_4Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_4Filler.json
@@ -1,38 +1,38 @@
 {
     "expPowerOf256_4": {
-        "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" : "0x0100000000",
-                    "0x01" : "0xfc05fc01",
-                    "0x02" : "0x0104060401"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x0100000000",
+                    "0x01": "0xfc05fc01",
+                    "0x02": "0x0104060401"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 4) [[ 1 ]] (EXP 255 4) [[ 2 ]] (EXP 257 4) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 4) [[ 1 ]] (EXP 255 4) [[ 2 ]] (EXP 257 4) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_5Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_5Filler.json
index d1fbda443..219a7d00f 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_5Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_5Filler.json
@@ -1,38 +1,38 @@
 {
     "expPowerOf256_5": {
-        "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" : "0x010000000000",
-                    "0x01" : "0xfb09f604ff",
-                    "0x02" : "0x01050a0a0501"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x010000000000",
+                    "0x01": "0xfb09f604ff",
+                    "0x02": "0x01050a0a0501"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 5) [[ 1 ]] (EXP 255 5) [[ 2 ]] (EXP 257 5) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 5) [[ 1 ]] (EXP 255 5) [[ 2 ]] (EXP 257 5) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_6Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_6Filler.json
index 57ab61f14..2dd516ef8 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_6Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_6Filler.json
@@ -1,38 +1,38 @@
 {
     "expPowerOf256_6": {
-        "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" : "0x01000000000000",
-                    "0x01" : "0xfa0eec0efa01",
-                    "0x02" : "0x01060f140f0601"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01000000000000",
+                    "0x01": "0xfa0eec0efa01",
+                    "0x02": "0x01060f140f0601"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 6) [[ 1 ]] (EXP 255 6) [[ 2 ]] (EXP 257 6) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 6) [[ 1 ]] (EXP 255 6) [[ 2 ]] (EXP 257 6) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_7Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_7Filler.json
index 4c2d2a300..7b29ba138 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_7Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_7Filler.json
@@ -1,38 +1,38 @@
 {
     "expPowerOf256_7": {
-        "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" : "0x0100000000000000",
-                    "0x01" : "0xf914dd22eb06ff",
-                    "0x02" : "0x0107152323150701"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x0100000000000000",
+                    "0x01": "0xf914dd22eb06ff",
+                    "0x02": "0x0107152323150701"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 7) [[ 1 ]] (EXP 255 7) [[ 2 ]] (EXP 257 7) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 7) [[ 1 ]] (EXP 255 7) [[ 2 ]] (EXP 257 7) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_8Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_8Filler.json
index 7196861d8..92c527f8c 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_8Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_8Filler.json
@@ -1,38 +1,38 @@
 {
     "expPowerOf256_8": {
-        "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" : "0x010000000000000000",
-                    "0x01" : "0xf81bc845c81bf801",
-                    "0x02" : "0x01081c3846381c0801"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x010000000000000000",
+                    "0x01": "0xf81bc845c81bf801",
+                    "0x02": "0x01081c3846381c0801"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 8) [[ 1 ]] (EXP 255 8) [[ 2 ]] (EXP 257 8) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 8) [[ 1 ]] (EXP 255 8) [[ 2 ]] (EXP 257 8) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_9Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_9Filler.json
index 2003bbe16..258793203 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_9Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf256_9Filler.json
@@ -1,38 +1,38 @@
 {
     "expPowerOf256_9": {
-        "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" : "0x01000000000000000000",
-                    "0x01" : "0xf723ac7d8253dc08ff",
-                    "0x02" : "0x010924547e7e54240901"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01000000000000000000",
+                    "0x01": "0xf723ac7d8253dc08ff",
+                    "0x02": "0x010924547e7e54240901"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 256 9) [[ 1 ]] (EXP 255 9) [[ 2 ]] (EXP 257 9) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 256 9) [[ 1 ]] (EXP 255 9) [[ 2 ]] (EXP 257 9) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf2_128Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf2_128Filler.json
index 37a1f5a18..224b07611 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf2_128Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf2_128Filler.json
@@ -1,38 +1,38 @@
 {
     "expPowerOf2_128": {
-        "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" : "0x0100000000000000000000000000000000",
-                    "0x01" : "0x80000000000000000000000000000000",
-                    "0x02" : "0x0200000000000000000000000000000000"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x0100000000000000000000000000000000",
+                    "0x01": "0x80000000000000000000000000000000",
+                    "0x02": "0x0200000000000000000000000000000000"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 2 128) [[ 1 ]] (EXP 2 127) [[ 2 ]] (EXP 2 129) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 2 128) [[ 1 ]] (EXP 2 127) [[ 2 ]] (EXP 2 129) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf2_16Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf2_16Filler.json
index 9bd5955f9..d8c022002 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf2_16Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf2_16Filler.json
@@ -1,38 +1,38 @@
 {
     "expPowerOf2_16": {
-        "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" : "0x010000",
-                    "0x01" : "0x8000",
-                    "0x02" : "0x020000"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x010000",
+                    "0x01": "0x8000",
+                    "0x02": "0x020000"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 2 16) [[ 1 ]] (EXP 2 15) [[ 2 ]] (EXP 2 17) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 2 16) [[ 1 ]] (EXP 2 15) [[ 2 ]] (EXP 2 17) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf2_256Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf2_256Filler.json
index da6f19426..af142ca10 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf2_256Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf2_256Filler.json
@@ -1,36 +1,36 @@
 {
     "expPowerOf2_256": {
-        "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" : "0x8000000000000000000000000000000000000000000000000000000000000000"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x01": "0x8000000000000000000000000000000000000000000000000000000000000000"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 2 256) [[ 1 ]] (EXP 2 255) [[ 2 ]] (EXP 2 257) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 2 256) [[ 1 ]] (EXP 2 255) [[ 2 ]] (EXP 2 257) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf2_2Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf2_2Filler.json
index ce8b2c503..1936733d3 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf2_2Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf2_2Filler.json
@@ -1,38 +1,38 @@
 {
     "expPowerOf2_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"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x" : "0x04",
-                    "0x01" : "0x02",
-                    "0x02" : "0x08"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x04",
+                    "0x01": "0x02",
+                    "0x02": "0x08"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 2 2) [[ 1 ]] (EXP 2 1) [[ 2 ]] (EXP 2 3) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 2 2) [[ 1 ]] (EXP 2 1) [[ 2 ]] (EXP 2 3) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf2_32Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf2_32Filler.json
index 2e6111b4c..4626bb36d 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf2_32Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf2_32Filler.json
@@ -1,38 +1,38 @@
 {
     "expPowerOf2_32": {
-        "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" : "0x0100000000",
-                    "0x01" : "0x80000000",
-                    "0x02" : "0x0200000000"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x0100000000",
+                    "0x01": "0x80000000",
+                    "0x02": "0x0200000000"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 2 32) [[ 1 ]] (EXP 2 31) [[ 2 ]] (EXP 2 33) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 2 32) [[ 1 ]] (EXP 2 31) [[ 2 ]] (EXP 2 33) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf2_4Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf2_4Filler.json
index b9edc9fae..4e283cd49 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf2_4Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf2_4Filler.json
@@ -1,38 +1,38 @@
 {
     "expPowerOf2_4": {
-        "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" : "0x10",
-                    "0x01" : "0x08",
-                    "0x02" : "0x20"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x10",
+                    "0x01": "0x08",
+                    "0x02": "0x20"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 2 4) [[ 1 ]] (EXP 2 3) [[ 2 ]] (EXP 2 5) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 2 4) [[ 1 ]] (EXP 2 3) [[ 2 ]] (EXP 2 5) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf2_64Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf2_64Filler.json
index 4e0e5998c..4cb9969b3 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf2_64Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf2_64Filler.json
@@ -1,38 +1,38 @@
 {
     "expPowerOf2_64": {
-        "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" : "0x010000000000000000",
-                    "0x01" : "0x8000000000000000",
-                    "0x02" : "0x020000000000000000"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x010000000000000000",
+                    "0x01": "0x8000000000000000",
+                    "0x02": "0x020000000000000000"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 2 64) [[ 1 ]] (EXP 2 63) [[ 2 ]] (EXP 2 65) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 2 64) [[ 1 ]] (EXP 2 63) [[ 2 ]] (EXP 2 65) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expPowerOf2_8Filler.json b/src/VMTestsFiller/vmArithmeticTest/expPowerOf2_8Filler.json
index 13c42b912..f694552a1 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expPowerOf2_8Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expPowerOf2_8Filler.json
@@ -1,38 +1,38 @@
 {
     "expPowerOf2_8": {
-        "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" : "0x0100",
-                    "0x01" : "0x80",
-                    "0x02" : "0x0200"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x0100",
+                    "0x01": "0x80",
+                    "0x02": "0x0200"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EXP 2 8) [[ 1 ]] (EXP 2 7) [[ 2 ]] (EXP 2 9) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EXP 2 8) [[ 1 ]] (EXP 2 7) [[ 2 ]] (EXP 2 9) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expXYFiller.json b/src/VMTestsFiller/vmArithmeticTest/expXYFiller.json
index 62089b015..5aa185622 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expXYFiller.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expXYFiller.json
@@ -1,37 +1,37 @@
 {
     "expXY": {
-        "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",
-                    "0x01" : "0x0100000000000f"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "0x0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000100000000000f",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x02",
+                    "0x01": "0x0100000000000f"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (CALLDATALOAD 0) [[ 1 ]] (CALLDATALOAD 32) [[ 2 ]] (EXP (SLOAD 0) (SLOAD 1))}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",                        
-            "data" : "0x0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000100000000000f",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (CALLDATALOAD 0) [[ 1 ]] (CALLDATALOAD 32) [[ 2 ]] (EXP (SLOAD 0) (SLOAD 1))}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/expXY_successFiller.json b/src/VMTestsFiller/vmArithmeticTest/expXY_successFiller.json
index 136a9cb85..aeb9b2675 100644
--- a/src/VMTestsFiller/vmArithmeticTest/expXY_successFiller.json
+++ b/src/VMTestsFiller/vmArithmeticTest/expXY_successFiller.json
@@ -1,38 +1,38 @@
 {
     "expXY_success": {
-        "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",
-                    "0x01" : "0x0f",
-		    "0x02" : "0x8000"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "0x0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000f",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x02",
+                    "0x01": "0x0f",
+                    "0x02": "0x8000"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (CALLDATALOAD 0) [[ 1 ]] (CALLDATALOAD 32) [[ 2 ]] (EXP (SLOAD 0) (SLOAD 1))}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",                        
-            "data" : "0x0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000f",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (CALLDATALOAD 0) [[ 1 ]] (CALLDATALOAD 32) [[ 2 ]] (EXP (SLOAD 0) (SLOAD 1))}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/fibbonacci_unrolledFiller.json b/src/VMTestsFiller/vmArithmeticTest/fibbonacci_unrolledFiller.json
index e6d937a81..3ba8c9bc0 100644
--- a/src/VMTestsFiller/vmArithmeticTest/fibbonacci_unrolledFiller.json
+++ b/src/VMTestsFiller/vmArithmeticTest/fibbonacci_unrolledFiller.json
@@ -1,35 +1,34 @@
 {
     "fibbonacci_unrolled": {
-        "env" : {
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-            "currentNumber" : "0",
-            "currentGasLimit" : "10000000",
-            "currentDifficulty" : "256",
-            "currentTimestamp" : "1",
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                }
-            }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "(asm 1 1 DUP2 DUP2 ADD DUP2 DUP2 ADD DUP2 DUP2 ADD DUP2 DUP2 ADD DUP2 DUP2 ADD DUP2 DUP2 ADD DUP2 DUP2 ADD DUP2 DUP2 ADD DUP2 DUP2 ADD DUP2 DUP2 ADD DUP2 DUP2 ADD DUP2 DUP2 ADD DUP2 DUP2 ADD DUP2 DUP2 ADD DUP2 DUP2 ADD DUP2 DUP2 ADD DUP2 DUP2 ADD 0 MSTORE 32 0 RETURN)",
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
                 "storage": {}
             }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "(asm 1 1 DUP2 DUP2 ADD DUP2 DUP2 ADD DUP2 DUP2 ADD DUP2 DUP2 ADD DUP2 DUP2 ADD DUP2 DUP2 ADD DUP2 DUP2 ADD DUP2 DUP2 ADD DUP2 DUP2 ADD DUP2 DUP2 ADD DUP2 DUP2 ADD DUP2 DUP2 ADD DUP2 DUP2 ADD DUP2 DUP2 ADD DUP2 DUP2 ADD DUP2 DUP2 ADD DUP2 DUP2 ADD 0 MSTORE 32 0 RETURN)",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/mod0Filler.json b/src/VMTestsFiller/vmArithmeticTest/mod0Filler.json
index 4c17dd81f..27ab4a413 100644
--- a/src/VMTestsFiller/vmArithmeticTest/mod0Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/mod0Filler.json
@@ -1,36 +1,36 @@
 {
     "mod0": {
-        "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": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x02"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (% 2 3 )  }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (% 2 3 )  }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/mod1Filler.json b/src/VMTestsFiller/vmArithmeticTest/mod1Filler.json
index 961481bd5..dedec221f 100644
--- a/src/VMTestsFiller/vmArithmeticTest/mod1Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/mod1Filler.json
@@ -1,36 +1,36 @@
 {
     "mod1": {
-        "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" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (% 115792089237316195423570985008687907853269984665640564039457584007913129639935 2 )  }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (% 115792089237316195423570985008687907853269984665640564039457584007913129639935 2 )  }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/mod2Filler.json b/src/VMTestsFiller/vmArithmeticTest/mod2Filler.json
index 5fd0728d4..cd10764f8 100644
--- a/src/VMTestsFiller/vmArithmeticTest/mod2Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/mod2Filler.json
@@ -1,36 +1,36 @@
 {
     "mod2": {
-        "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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (% 0 115792089237316195423570985008687907853269984665640564039457584007913129639935 )  }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (% 0 115792089237316195423570985008687907853269984665640564039457584007913129639935 )  }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/mod3Filler.json b/src/VMTestsFiller/vmArithmeticTest/mod3Filler.json
index bc13faf64..aa9854115 100644
--- a/src/VMTestsFiller/vmArithmeticTest/mod3Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/mod3Filler.json
@@ -1,36 +1,36 @@
 {
     "mod3": {
-        "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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (% 3 0)  }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (% 3 0)  }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/mod4Filler.json b/src/VMTestsFiller/vmArithmeticTest/mod4Filler.json
index 2250ef07c..be6587499 100644
--- a/src/VMTestsFiller/vmArithmeticTest/mod4Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/mod4Filler.json
@@ -1,36 +1,36 @@
 {
     "mod4": {
-        "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": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x02"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (% (- 0 2) 3)  }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (% (- 0 2) 3)  }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/modByZeroFiller.json b/src/VMTestsFiller/vmArithmeticTest/modByZeroFiller.json
index f4db6acb5..fdb1817c0 100644
--- a/src/VMTestsFiller/vmArithmeticTest/modByZeroFiller.json
+++ b/src/VMTestsFiller/vmArithmeticTest/modByZeroFiller.json
@@ -1,29 +1,29 @@
 {
     "modByZero": {
-        "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" : "{ [[ 0 ]] (- (% 3 0) 1)  }",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (- (% 3 0) 1)  }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/mul0Filler.json b/src/VMTestsFiller/vmArithmeticTest/mul0Filler.json
index 73a1f774a..f62af0119 100644
--- a/src/VMTestsFiller/vmArithmeticTest/mul0Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/mul0Filler.json
@@ -1,36 +1,36 @@
 {
     "mul0": {
-        "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" : "0x06"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x06"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (* 2 3) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (* 2 3) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/mul1Filler.json b/src/VMTestsFiller/vmArithmeticTest/mul1Filler.json
index bac387b69..04d5c1c1c 100644
--- a/src/VMTestsFiller/vmArithmeticTest/mul1Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/mul1Filler.json
@@ -1,36 +1,36 @@
 {
     "mul1": {
-        "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" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (* 115792089237316195423570985008687907853269984665640564039457584007913129639935 115792089237316195423570985008687907853269984665640564039457584007913129639935) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (* 115792089237316195423570985008687907853269984665640564039457584007913129639935 115792089237316195423570985008687907853269984665640564039457584007913129639935) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/mul2Filler.json b/src/VMTestsFiller/vmArithmeticTest/mul2Filler.json
index 2602f38ce..afed731c3 100644
--- a/src/VMTestsFiller/vmArithmeticTest/mul2Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/mul2Filler.json
@@ -1,36 +1,36 @@
 {
     "mul2": {
-        "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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (* 0 23) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (* 0 23) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/mul3Filler.json b/src/VMTestsFiller/vmArithmeticTest/mul3Filler.json
index 4fbfa513f..c2449c80c 100644
--- a/src/VMTestsFiller/vmArithmeticTest/mul3Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/mul3Filler.json
@@ -1,36 +1,36 @@
 {
     "mul3": {
-        "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" : "0x17"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x17"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (* 23 1) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (* 23 1) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/mul4Filler.json b/src/VMTestsFiller/vmArithmeticTest/mul4Filler.json
index 8236c8c66..61c0856cc 100644
--- a/src/VMTestsFiller/vmArithmeticTest/mul4Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/mul4Filler.json
@@ -1,36 +1,36 @@
 {
     "mul4": {
-        "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" : "0x8000000000000000000000000000000000000000000000000000000000000000"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x8000000000000000000000000000000000000000000000000000000000000000"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (* 0x8000000000000000000000000000000000000000000000000000000000000000 115792089237316195423570985008687907853269984665640564039457584007913129639935) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (* 0x8000000000000000000000000000000000000000000000000000000000000000 115792089237316195423570985008687907853269984665640564039457584007913129639935) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/mul5Filler.json b/src/VMTestsFiller/vmArithmeticTest/mul5Filler.json
index 083420973..d0ffdf4ac 100644
--- a/src/VMTestsFiller/vmArithmeticTest/mul5Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/mul5Filler.json
@@ -1,36 +1,36 @@
 {
     "mul5": {
-        "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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (* 0x8000000000000000000000000000000000000000000000000000000000000000 0x8000000000000000000000000000000000000000000000000000000000000000) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (* 0x8000000000000000000000000000000000000000000000000000000000000000 0x8000000000000000000000000000000000000000000000000000000000000000) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/mul6Filler.json b/src/VMTestsFiller/vmArithmeticTest/mul6Filler.json
index e5d562584..0cb6bdc01 100644
--- a/src/VMTestsFiller/vmArithmeticTest/mul6Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/mul6Filler.json
@@ -1,36 +1,36 @@
 {
     "mul6": {
-        "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" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (* 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (* 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/mul7Filler.json b/src/VMTestsFiller/vmArithmeticTest/mul7Filler.json
index 4ca2a20d0..a44a715f0 100644
--- a/src/VMTestsFiller/vmArithmeticTest/mul7Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/mul7Filler.json
@@ -1,36 +1,36 @@
 {
     "mul7": {
-        "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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "(asm 0x1234567890abcdef0fedcba0987654321 0x1234567890abcdef0fedcba0987654321 0x1234567890abcdef0fedcba0987654321 MUL MUL 0 MSTORE 32 0 RETURN)",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "(asm 0x1234567890abcdef0fedcba0987654321 0x1234567890abcdef0fedcba0987654321 0x1234567890abcdef0fedcba0987654321 MUL MUL 0 MSTORE 32 0 RETURN)",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/mulUnderFlowFiller.json b/src/VMTestsFiller/vmArithmeticTest/mulUnderFlowFiller.json
index c02b000cc..538d2b64c 100644
--- a/src/VMTestsFiller/vmArithmeticTest/mulUnderFlowFiller.json
+++ b/src/VMTestsFiller/vmArithmeticTest/mulUnderFlowFiller.json
@@ -1,29 +1,29 @@
 {
     "mulUnderFlow": {
-        "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" : "(asm 1 MUL 01 SSTORE)",
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "(asm 1 MUL 01 SSTORE)",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/mulmod0Filler.json b/src/VMTestsFiller/vmArithmeticTest/mulmod0Filler.json
index bc00a7486..621fa1c8f 100644
--- a/src/VMTestsFiller/vmArithmeticTest/mulmod0Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/mulmod0Filler.json
@@ -1,36 +1,36 @@
 {
     "mulmod0": {
-        "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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (MULMOD 1 2 2) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (MULMOD 1 2 2) } ",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/mulmod1Filler.json b/src/VMTestsFiller/vmArithmeticTest/mulmod1Filler.json
index 7c450693a..e30065087 100644
--- a/src/VMTestsFiller/vmArithmeticTest/mulmod1Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/mulmod1Filler.json
@@ -1,36 +1,36 @@
 {
     "mulmod1": {
-        "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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (MULMOD (- 0 1) (- 0 2) 3) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (MULMOD (- 0 1) (- 0 2) 3) } ",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/mulmod1_overflow2Filler.json b/src/VMTestsFiller/vmArithmeticTest/mulmod1_overflow2Filler.json
index dc2e7ee5d..3e33b901a 100644
--- a/src/VMTestsFiller/vmArithmeticTest/mulmod1_overflow2Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/mulmod1_overflow2Filler.json
@@ -1,29 +1,29 @@
 {
     "mulmod1_overflow2": {
-        "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" : "{ [[ 0 ]] (MULMOD 57896044618658097711785492504343953926634992332820282019728792003956564819968 2 5) } ",
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (MULMOD 57896044618658097711785492504343953926634992332820282019728792003956564819968 2 5) } ",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/mulmod1_overflow3Filler.json b/src/VMTestsFiller/vmArithmeticTest/mulmod1_overflow3Filler.json
index 55eb54fe0..905b3c32e 100644
--- a/src/VMTestsFiller/vmArithmeticTest/mulmod1_overflow3Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/mulmod1_overflow3Filler.json
@@ -1,29 +1,29 @@
 {
     "mulmod1_overflow3": {
-        "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" : "{ [[ 0 ]] (MULMOD 57896044618658097711785492504343953926634992332820282019728792003956564819967 2 5) } ",
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (MULMOD 57896044618658097711785492504343953926634992332820282019728792003956564819967 2 5) } ",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/mulmod1_overflow4Filler.json b/src/VMTestsFiller/vmArithmeticTest/mulmod1_overflow4Filler.json
index 43d6cfe22..bb39d3fcd 100644
--- a/src/VMTestsFiller/vmArithmeticTest/mulmod1_overflow4Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/mulmod1_overflow4Filler.json
@@ -1,29 +1,29 @@
 {
     "mulmod1_overflow4": {
-        "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" : "{ [[ 0 ]] (MULMOD 57896044618658097711785492504343953926634992332820282019728792003956564819969 2 5) } ",
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (MULMOD 57896044618658097711785492504343953926634992332820282019728792003956564819969 2 5) } ",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/mulmod1_overflowFiller.json b/src/VMTestsFiller/vmArithmeticTest/mulmod1_overflowFiller.json
index 800951bd4..df075661e 100644
--- a/src/VMTestsFiller/vmArithmeticTest/mulmod1_overflowFiller.json
+++ b/src/VMTestsFiller/vmArithmeticTest/mulmod1_overflowFiller.json
@@ -1,36 +1,36 @@
 {
     "mulmod1_overflow": {
-        "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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "10000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (MULMOD (- 0 1) 2 5) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (MULMOD (- 0 1) 2 5) } ",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "10000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/mulmod2Filler.json b/src/VMTestsFiller/vmArithmeticTest/mulmod2Filler.json
index e56cebe92..5e9611908 100644
--- a/src/VMTestsFiller/vmArithmeticTest/mulmod2Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/mulmod2Filler.json
@@ -1,36 +1,36 @@
 {
     "mulmod2": {
-        "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": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x02"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (MULMOD (- 0 5) 1 3) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (MULMOD (- 0 5) 1 3) } ",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/mulmod2_0Filler.json b/src/VMTestsFiller/vmArithmeticTest/mulmod2_0Filler.json
index d43bef7ab..7eec80571 100644
--- a/src/VMTestsFiller/vmArithmeticTest/mulmod2_0Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/mulmod2_0Filler.json
@@ -1,36 +1,36 @@
 {
     "mulmod2_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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (EQ (SMOD (- 0 5) 3) (MULMOD (- 0 5) 1 3) ) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EQ (SMOD (- 0 5) 3) (MULMOD (- 0 5) 1 3) ) } ",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/mulmod2_1Filler.json b/src/VMTestsFiller/vmArithmeticTest/mulmod2_1Filler.json
index f70ff7a21..4752b0ab4 100644
--- a/src/VMTestsFiller/vmArithmeticTest/mulmod2_1Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/mulmod2_1Filler.json
@@ -1,36 +1,36 @@
 {
     "mulmod2_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" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "{[[ 0 ]] (EQ (MOD (- 0 5) 3) (MULMOD (- 0 5) 1 3) ) }",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{[[ 0 ]] (EQ (MOD (- 0 5) 3) (MULMOD (- 0 5) 1 3) ) }",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/mulmod3Filler.json b/src/VMTestsFiller/vmArithmeticTest/mulmod3Filler.json
index 8887d458b..dcafe05d2 100644
--- a/src/VMTestsFiller/vmArithmeticTest/mulmod3Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/mulmod3Filler.json
@@ -1,36 +1,36 @@
 {
     "mulmod3": {
-        "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": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x05"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (MULMOD 5 1 (- 0 3) )} ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (MULMOD 5 1 (- 0 3) )} ",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/mulmod3_0Filler.json b/src/VMTestsFiller/vmArithmeticTest/mulmod3_0Filler.json
index fa31f92f1..57c02b1b7 100644
--- a/src/VMTestsFiller/vmArithmeticTest/mulmod3_0Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/mulmod3_0Filler.json
@@ -1,36 +1,36 @@
 {
     "mulmod3_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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (EQ (MULMOD 5 1 (- 0 3) ) 2 )} ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (EQ (MULMOD 5 1 (- 0 3) ) 2 )} ",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/mulmod4Filler.json b/src/VMTestsFiller/vmArithmeticTest/mulmod4Filler.json
index 62916cc39..58c432781 100644
--- a/src/VMTestsFiller/vmArithmeticTest/mulmod4Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/mulmod4Filler.json
@@ -1,36 +1,36 @@
 {
     "mulmod4": {
-        "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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "(asm 100 27 37 MULMOD 0 MSTORE8 0 1 RETURN)",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "(asm 100 27 37 MULMOD 0 MSTORE8 0 1 RETURN)",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/mulmoddivByZero1Filler.json b/src/VMTestsFiller/vmArithmeticTest/mulmoddivByZero1Filler.json
index 744984a2e..837c37828 100644
--- a/src/VMTestsFiller/vmArithmeticTest/mulmoddivByZero1Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/mulmoddivByZero1Filler.json
@@ -1,36 +1,36 @@
 {
     "mulmoddivByZero1": {
-        "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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (MULMOD 0 1 0) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (MULMOD 0 1 0) } ",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/mulmoddivByZero2Filler.json b/src/VMTestsFiller/vmArithmeticTest/mulmoddivByZero2Filler.json
index df383296b..ed79161f3 100644
--- a/src/VMTestsFiller/vmArithmeticTest/mulmoddivByZero2Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/mulmoddivByZero2Filler.json
@@ -1,36 +1,36 @@
 {
     "mulmoddivByZero2": {
-        "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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (MULMOD 1 0 0) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (MULMOD 1 0 0) } ",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/mulmoddivByZero3Filler.json b/src/VMTestsFiller/vmArithmeticTest/mulmoddivByZero3Filler.json
index a1043f474..558764d7c 100644
--- a/src/VMTestsFiller/vmArithmeticTest/mulmoddivByZero3Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/mulmoddivByZero3Filler.json
@@ -1,29 +1,29 @@
 {
     "mulmoddivByZero3": {
-        "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" : "{ [[ 0 ]] (- 1 (MULMOD 0 0 0)) } ",
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (- 1 (MULMOD 0 0 0)) } ",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/mulmoddivByZeroFiller.json b/src/VMTestsFiller/vmArithmeticTest/mulmoddivByZeroFiller.json
index f424caf2e..73c1ad83d 100644
--- a/src/VMTestsFiller/vmArithmeticTest/mulmoddivByZeroFiller.json
+++ b/src/VMTestsFiller/vmArithmeticTest/mulmoddivByZeroFiller.json
@@ -1,36 +1,36 @@
 {
     "mulmoddivByZero": {
-        "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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (MULMOD 5 1 0) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (MULMOD 5 1 0) } ",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/not1Filler.json b/src/VMTestsFiller/vmArithmeticTest/not1Filler.json
index ef3bd7ac7..c3e4a4ec8 100644
--- a/src/VMTestsFiller/vmArithmeticTest/not1Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/not1Filler.json
@@ -1,35 +1,34 @@
 {
     "not1": {
-        "env" : {
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-            "currentNumber" : "0",
-            "currentGasLimit" : "10000000",
-            "currentDifficulty" : "256",
-            "currentTimestamp" : "1",
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                }
-            }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "(asm 123456 0 MSTORE 0 MLOAD NOT 0 MSTORE 32 0 RETURN)",
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
                 "storage": {}
             }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "(asm 123456 0 MSTORE 0 MLOAD NOT 0 MSTORE 32 0 RETURN)",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/sdiv0Filler.json b/src/VMTestsFiller/vmArithmeticTest/sdiv0Filler.json
index da6d90144..4aad17b09 100644
--- a/src/VMTestsFiller/vmArithmeticTest/sdiv0Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/sdiv0Filler.json
@@ -1,36 +1,36 @@
 {
     "sdiv0": {
-        "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" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (SDIV (- 0 115792089237316195423570985008687907853269984665640564039457584007913129639935) 115792089237316195423570985008687907853269984665640564039457584007913129639935)  }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (SDIV (- 0 115792089237316195423570985008687907853269984665640564039457584007913129639935) 115792089237316195423570985008687907853269984665640564039457584007913129639935)  }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/sdiv1Filler.json b/src/VMTestsFiller/vmArithmeticTest/sdiv1Filler.json
index 4f57cc5fe..ca30e820c 100644
--- a/src/VMTestsFiller/vmArithmeticTest/sdiv1Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/sdiv1Filler.json
@@ -1,36 +1,36 @@
 {
     "sdiv1": {
-        "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" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (SDIV 115792089237316195423570985008687907853269984665640564039457584007913129639935 (- 0 115792089237316195423570985008687907853269984665640564039457584007913129639935) )  }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (SDIV 115792089237316195423570985008687907853269984665640564039457584007913129639935 (- 0 115792089237316195423570985008687907853269984665640564039457584007913129639935) )  }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/sdiv2Filler.json b/src/VMTestsFiller/vmArithmeticTest/sdiv2Filler.json
index 8c3567f6b..07910f832 100644
--- a/src/VMTestsFiller/vmArithmeticTest/sdiv2Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/sdiv2Filler.json
@@ -1,36 +1,36 @@
 {
     "sdiv2": {
-        "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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (SDIV (- 0 2) (- 0 4) )  }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (SDIV (- 0 2) (- 0 4) )  }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/sdiv3Filler.json b/src/VMTestsFiller/vmArithmeticTest/sdiv3Filler.json
index 2ac3ab8b3..f3a969b16 100644
--- a/src/VMTestsFiller/vmArithmeticTest/sdiv3Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/sdiv3Filler.json
@@ -1,36 +1,36 @@
 {
     "sdiv3": {
-        "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" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (SDIV 4 (- 0 2) )  }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (SDIV 4 (- 0 2) )  }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/sdiv4Filler.json b/src/VMTestsFiller/vmArithmeticTest/sdiv4Filler.json
index ea60b0bc3..29c873a16 100644
--- a/src/VMTestsFiller/vmArithmeticTest/sdiv4Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/sdiv4Filler.json
@@ -1,36 +1,36 @@
 {
     "sdiv4": {
-        "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" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (SDIV 5 (- 0 4) )  }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (SDIV 5 (- 0 4) )  }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/sdiv5Filler.json b/src/VMTestsFiller/vmArithmeticTest/sdiv5Filler.json
index 5243d6516..a04ae17e4 100644
--- a/src/VMTestsFiller/vmArithmeticTest/sdiv5Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/sdiv5Filler.json
@@ -1,36 +1,36 @@
 {
     "sdiv5": {
-        "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" : "0x8000000000000000000000000000000000000000000000000000000000000000"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x8000000000000000000000000000000000000000000000000000000000000000"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (SDIV (- 0 57896044618658097711785492504343953926634992332820282019728792003956564819968) (- 0 1) )  }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (SDIV (- 0 57896044618658097711785492504343953926634992332820282019728792003956564819968) (- 0 1) )  }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/sdiv6Filler.json b/src/VMTestsFiller/vmArithmeticTest/sdiv6Filler.json
index eea7dbf3f..7d3bf8a20 100644
--- a/src/VMTestsFiller/vmArithmeticTest/sdiv6Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/sdiv6Filler.json
@@ -1,36 +1,36 @@
 {
     "sdiv6": {
-        "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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (SDIV (- 0 57896044618658097711785492504343953926634992332820282019728792003956564819968) 0 )  }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (SDIV (- 0 57896044618658097711785492504343953926634992332820282019728792003956564819968) 0 )  }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/sdiv7Filler.json b/src/VMTestsFiller/vmArithmeticTest/sdiv7Filler.json
index 72b80f3bd..ab5830df6 100644
--- a/src/VMTestsFiller/vmArithmeticTest/sdiv7Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/sdiv7Filler.json
@@ -1,36 +1,36 @@
 {
     "sdiv7": {
-        "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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (SDIV (- 0 1) 25 )  }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (SDIV (- 0 1) 25 )  }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/sdiv8Filler.json b/src/VMTestsFiller/vmArithmeticTest/sdiv8Filler.json
index 4f6ef7926..f292dc3e1 100644
--- a/src/VMTestsFiller/vmArithmeticTest/sdiv8Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/sdiv8Filler.json
@@ -1,36 +1,36 @@
 {
     "sdiv8": {
-        "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" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (SDIV (- 0 1) (- 0 1))  }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (SDIV (- 0 1) (- 0 1))  }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/sdiv9Filler.json b/src/VMTestsFiller/vmArithmeticTest/sdiv9Filler.json
index 55caef2d0..befdc1606 100644
--- a/src/VMTestsFiller/vmArithmeticTest/sdiv9Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/sdiv9Filler.json
@@ -1,36 +1,36 @@
 {
     "sdiv9": {
-        "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" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (SDIV (- 0 1) 1)  }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (SDIV (- 0 1) 1)  }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/sdivByZero0Filler.json b/src/VMTestsFiller/vmArithmeticTest/sdivByZero0Filler.json
index 8bc456e66..40e1ce58d 100644
--- a/src/VMTestsFiller/vmArithmeticTest/sdivByZero0Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/sdivByZero0Filler.json
@@ -1,36 +1,36 @@
 {
     "sdivByZero0": {
-        "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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (SDIV (- 0 3) (- 0 0))  }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (SDIV (- 0 3) (- 0 0))  }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/sdivByZero1Filler.json b/src/VMTestsFiller/vmArithmeticTest/sdivByZero1Filler.json
index 357ec2509..b68be783d 100644
--- a/src/VMTestsFiller/vmArithmeticTest/sdivByZero1Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/sdivByZero1Filler.json
@@ -1,36 +1,36 @@
 {
     "sdivByZero1": {
-        "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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (SDIV (- 0 115792089237316195423570985008687907853269984665640564039457584007913129639935) 0)  }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (SDIV (- 0 115792089237316195423570985008687907853269984665640564039457584007913129639935) 0)  }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/sdivByZero2Filler.json b/src/VMTestsFiller/vmArithmeticTest/sdivByZero2Filler.json
index 12d3c7c80..70510832e 100644
--- a/src/VMTestsFiller/vmArithmeticTest/sdivByZero2Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/sdivByZero2Filler.json
@@ -1,29 +1,29 @@
 {
     "sdivByZero2": {
-        "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" : "{ [[ 0 ]] (+ (SDIV (- 0 115792089237316195423570985008687907853269984665640564039457584007900129639935) 0) 1) }",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (+ (SDIV (- 0 115792089237316195423570985008687907853269984665640564039457584007900129639935) 0) 1) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/sdiv_dejavuFiller.json b/src/VMTestsFiller/vmArithmeticTest/sdiv_dejavuFiller.json
index 371be730a..d39906931 100644
--- a/src/VMTestsFiller/vmArithmeticTest/sdiv_dejavuFiller.json
+++ b/src/VMTestsFiller/vmArithmeticTest/sdiv_dejavuFiller.json
@@ -1,36 +1,36 @@
 {
     "sdiv_dejavu": {
-        "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" : {
-                    "0x00" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "10000000",
+            "gasPrice": "1",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x00": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "( asm 0x05 0x09 0x00 SUB SDIV DUP1 0x0 SSTORE )",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "1",
-            "gas" : "10000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "( asm 0x05 0x09 0x00 SUB SDIV DUP1 0x0 SSTORE )",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/sdiv_i256min2Filler.json b/src/VMTestsFiller/vmArithmeticTest/sdiv_i256min2Filler.json
index 54b14a3be..c866461b8 100644
--- a/src/VMTestsFiller/vmArithmeticTest/sdiv_i256min2Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/sdiv_i256min2Filler.json
@@ -1,36 +1,36 @@
 {
     "sdiv_i256min2": {
-        "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" : "0x8000000000000000000000000000000000000000000000000000000000000000"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x8000000000000000000000000000000000000000000000000000000000000000"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (SDIV (- 0 57896044618658097711785492504343953926634992332820282019728792003956564819968) (- 0 1) )  }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (SDIV (- 0 57896044618658097711785492504343953926634992332820282019728792003956564819968) (- 0 1) )  }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/sdiv_i256min3Filler.json b/src/VMTestsFiller/vmArithmeticTest/sdiv_i256min3Filler.json
index cfaa6acf1..8e18a1ce4 100644
--- a/src/VMTestsFiller/vmArithmeticTest/sdiv_i256min3Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/sdiv_i256min3Filler.json
@@ -1,36 +1,36 @@
 {
     "sdiv_i256min3": {
-        "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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "1",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (SDIV 115792089237316195423570985008687907853269984665640564039457584007913129639935 (- 0 57896044618658097711785492504343953926634992332820282019728792003956564819967) )  }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "1",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (SDIV 115792089237316195423570985008687907853269984665640564039457584007913129639935 (- 0 57896044618658097711785492504343953926634992332820282019728792003956564819967) )  }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/sdiv_i256minFiller.json b/src/VMTestsFiller/vmArithmeticTest/sdiv_i256minFiller.json
index cd0d5fe0f..7e5b7d77f 100644
--- a/src/VMTestsFiller/vmArithmeticTest/sdiv_i256minFiller.json
+++ b/src/VMTestsFiller/vmArithmeticTest/sdiv_i256minFiller.json
@@ -1,36 +1,36 @@
 {
     "sdiv_i256min": {
-        "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" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (SDIV (- 0 57896044618658097711785492504343953926634992332820282019728792003956564819967) (- 0 1) )  }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (SDIV (- 0 57896044618658097711785492504343953926634992332820282019728792003956564819967) (- 0 1) )  }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/signextendInvalidByteNumberFiller.json b/src/VMTestsFiller/vmArithmeticTest/signextendInvalidByteNumberFiller.json
index ae613a587..1226f57ff 100644
--- a/src/VMTestsFiller/vmArithmeticTest/signextendInvalidByteNumberFiller.json
+++ b/src/VMTestsFiller/vmArithmeticTest/signextendInvalidByteNumberFiller.json
@@ -1,36 +1,36 @@
 {
     "signextendInvalidByteNumber": {
-        "env" : {
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-            "currentNumber" : "0",
-            "currentGasLimit" : "10000000",
-            "currentDifficulty" : "256",
-            "currentTimestamp" : "1",
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-	"expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x" : "0x126af4"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x126af4"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "0x62126af460500b600055",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "0x62126af460500b600055",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/signextend_00Filler.json b/src/VMTestsFiller/vmArithmeticTest/signextend_00Filler.json
index a4447a0ee..3fada81b5 100644
--- a/src/VMTestsFiller/vmArithmeticTest/signextend_00Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/signextend_00Filler.json
@@ -1,35 +1,34 @@
 {
     "signextend_00": {
-        "env" : {
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-            "currentNumber" : "0",
-            "currentGasLimit" : "10000000",
-            "currentDifficulty" : "256",
-            "currentTimestamp" : "1",
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-	"expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                }
-            }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (SIGNEXTEND 0 0) } ",
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
                 "storage": {}
             }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (SIGNEXTEND 0 0) } ",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/signextend_0_BigByteFiller.json b/src/VMTestsFiller/vmArithmeticTest/signextend_0_BigByteFiller.json
index 0e34f7ae5..4c294f2f9 100644
--- a/src/VMTestsFiller/vmArithmeticTest/signextend_0_BigByteFiller.json
+++ b/src/VMTestsFiller/vmArithmeticTest/signextend_0_BigByteFiller.json
@@ -1,36 +1,36 @@
 {
     "signextend_0_BigByte": {
-        "env" : {
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-            "currentNumber" : "0",
-            "currentGasLimit" : "10000000",
-            "currentDifficulty" : "256",
-            "currentTimestamp" : "1",
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (SIGNEXTEND 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (SIGNEXTEND 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) } ",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/signextend_AlmostBiggestByteFiller.json b/src/VMTestsFiller/vmArithmeticTest/signextend_AlmostBiggestByteFiller.json
index a910d1e3a..6142d1633 100644
--- a/src/VMTestsFiller/vmArithmeticTest/signextend_AlmostBiggestByteFiller.json
+++ b/src/VMTestsFiller/vmArithmeticTest/signextend_AlmostBiggestByteFiller.json
@@ -1,36 +1,36 @@
 {
     "signextend_AlmostBiggestByte": {
-        "env" : {
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-            "currentNumber" : "0",
-            "currentGasLimit" : "10000000",
-            "currentDifficulty" : "256",
-            "currentTimestamp" : "1",
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (SIGNEXTEND 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (SIGNEXTEND 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe) } ",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/signextend_BigByteBigByteFiller.json b/src/VMTestsFiller/vmArithmeticTest/signextend_BigByteBigByteFiller.json
index cf62f99a3..21a77597c 100644
--- a/src/VMTestsFiller/vmArithmeticTest/signextend_BigByteBigByteFiller.json
+++ b/src/VMTestsFiller/vmArithmeticTest/signextend_BigByteBigByteFiller.json
@@ -1,36 +1,36 @@
 {
     "signextend_BigByteBigByte": {
-        "env" : {
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-            "currentNumber" : "0",
-            "currentGasLimit" : "10000000",
-            "currentDifficulty" : "256",
-            "currentTimestamp" : "1",
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (SIGNEXTEND 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (SIGNEXTEND 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) } ",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/signextend_BigBytePlus1_2Filler.json b/src/VMTestsFiller/vmArithmeticTest/signextend_BigBytePlus1_2Filler.json
index f2280d09a..026600cb4 100644
--- a/src/VMTestsFiller/vmArithmeticTest/signextend_BigBytePlus1_2Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/signextend_BigBytePlus1_2Filler.json
@@ -1,36 +1,36 @@
 {
     "signextend_BigBytePlus1_2": {
-        "env" : {
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-            "currentNumber" : "0",
-            "currentGasLimit" : "10000000",
-            "currentDifficulty" : "256",
-            "currentTimestamp" : "1",
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x" : "0xff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xff"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "0x60ff68f000000000000000010b600055",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "0x60ff68f000000000000000010b600055",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/signextend_BigByte_0Filler.json b/src/VMTestsFiller/vmArithmeticTest/signextend_BigByte_0Filler.json
index f8ea361a4..92f8ba942 100644
--- a/src/VMTestsFiller/vmArithmeticTest/signextend_BigByte_0Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/signextend_BigByte_0Filler.json
@@ -1,35 +1,34 @@
 {
     "signextend_BigByte_0": {
-        "env" : {
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-            "currentNumber" : "0",
-            "currentGasLimit" : "10000000",
-            "currentDifficulty" : "256",
-            "currentTimestamp" : "1",
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-	"expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                }
-            }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (SIGNEXTEND 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0) } ",
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
                 "storage": {}
             }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (SIGNEXTEND 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0) } ",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/signextend_BitIsNotSetFiller.json b/src/VMTestsFiller/vmArithmeticTest/signextend_BitIsNotSetFiller.json
index 156ad8b1d..dbb5593ce 100644
--- a/src/VMTestsFiller/vmArithmeticTest/signextend_BitIsNotSetFiller.json
+++ b/src/VMTestsFiller/vmArithmeticTest/signextend_BitIsNotSetFiller.json
@@ -1,36 +1,36 @@
 {
     "signextend_BitIsNotSet": {
-        "env" : {
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-            "currentNumber" : "0",
-            "currentGasLimit" : "10000000",
-            "currentDifficulty" : "256",
-            "currentTimestamp" : "1",
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x" : "0x6a"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x6a"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "0x62122f6a60000b600055",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "0x62122f6a60000b600055",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/signextend_BitIsNotSetInHigherByteFiller.json b/src/VMTestsFiller/vmArithmeticTest/signextend_BitIsNotSetInHigherByteFiller.json
index 7179f60be..12d3b3870 100644
--- a/src/VMTestsFiller/vmArithmeticTest/signextend_BitIsNotSetInHigherByteFiller.json
+++ b/src/VMTestsFiller/vmArithmeticTest/signextend_BitIsNotSetInHigherByteFiller.json
@@ -1,36 +1,36 @@
 {
     "signextend_BitIsNotSetInHigherByte": {
-        "env" : {
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-            "currentNumber" : "0",
-            "currentGasLimit" : "10000000",
-            "currentDifficulty" : "256",
-            "currentTimestamp" : "1",
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-	"expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x" : "0x6af4"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x6af4"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "0x62126af460010b600055",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "0x62126af460010b600055",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/signextend_BitIsSetInHigherByteFiller.json b/src/VMTestsFiller/vmArithmeticTest/signextend_BitIsSetInHigherByteFiller.json
index 38fa966dd..ba6c12e6a 100644
--- a/src/VMTestsFiller/vmArithmeticTest/signextend_BitIsSetInHigherByteFiller.json
+++ b/src/VMTestsFiller/vmArithmeticTest/signextend_BitIsSetInHigherByteFiller.json
@@ -1,36 +1,36 @@
 {
     "signextend_BitIsSetInHigherByte": {
-        "env" : {
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-            "currentNumber" : "0",
-            "currentGasLimit" : "10000000",
-            "currentDifficulty" : "256",
-            "currentTimestamp" : "1",
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaf4"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaf4"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "0x6212faf460010b600055",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "0x6212faf460010b600055",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/signextend_Overflow_dj42Filler.json b/src/VMTestsFiller/vmArithmeticTest/signextend_Overflow_dj42Filler.json
index 92f6f30e4..cbb6c1995 100644
--- a/src/VMTestsFiller/vmArithmeticTest/signextend_Overflow_dj42Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/signextend_Overflow_dj42Filler.json
@@ -1,35 +1,34 @@
 {
     "signextend_Overflow_dj42": {
-        "env" : {
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-            "currentNumber" : "0",
-            "currentGasLimit" : "10000000",
-            "currentDifficulty" : "256",
-            "currentTimestamp" : "1",
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                }
-            }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "(asm 0x05 JUMP JUMPDEST STOP JUMPDEST 0x8000 DUP1 0x010000000000000001 SIGNEXTEND 0x8001 GT 0x03 JUMPI 0xbadf000d 0x11 SSTORE)",
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
                 "storage": {}
             }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "(asm 0x05 JUMP JUMPDEST STOP JUMPDEST 0x8000 DUP1 0x010000000000000001 SIGNEXTEND 0x8001 GT 0x03 JUMPI 0xbadf000d 0x11 SSTORE)",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/signextend_bigBytePlus1Filler.json b/src/VMTestsFiller/vmArithmeticTest/signextend_bigBytePlus1Filler.json
index 2af5a522b..2d484ac1f 100644
--- a/src/VMTestsFiller/vmArithmeticTest/signextend_bigBytePlus1Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/signextend_bigBytePlus1Filler.json
@@ -1,36 +1,36 @@
 {
     "signextend_bigBytePlus1": {
-        "env" : {
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-            "currentNumber" : "0",
-            "currentGasLimit" : "10000000",
-            "currentDifficulty" : "256",
-            "currentTimestamp" : "1",
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x" : "0xf0000000000001"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xf0000000000001"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "0x66f000000000000161ffff0b600055",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "0x66f000000000000161ffff0b600055",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/signextend_bitIsSetFiller.json b/src/VMTestsFiller/vmArithmeticTest/signextend_bitIsSetFiller.json
index 3a21fe850..67e3eb3b2 100644
--- a/src/VMTestsFiller/vmArithmeticTest/signextend_bitIsSetFiller.json
+++ b/src/VMTestsFiller/vmArithmeticTest/signextend_bitIsSetFiller.json
@@ -1,36 +1,36 @@
 {
-     "signextend_bitIsSet": {
-        "env" : {
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-            "currentNumber" : "0",
-            "currentGasLimit" : "10000000",
-            "currentDifficulty" : "256",
-            "currentTimestamp" : "1",
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+    "signextend_bitIsSet": {
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff4"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff4"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "0x62122ff460000b600055",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "0x62122ff460000b600055",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/smod0Filler.json b/src/VMTestsFiller/vmArithmeticTest/smod0Filler.json
index 1ee919d28..9fb6589a5 100644
--- a/src/VMTestsFiller/vmArithmeticTest/smod0Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/smod0Filler.json
@@ -1,36 +1,36 @@
 {
     "smod0": {
-        "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" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (SMOD (- 0 5) (- 0 3))}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (SMOD (- 0 5) (- 0 3))}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/smod1Filler.json b/src/VMTestsFiller/vmArithmeticTest/smod1Filler.json
index a6c1d3413..6a03e59ea 100644
--- a/src/VMTestsFiller/vmArithmeticTest/smod1Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/smod1Filler.json
@@ -1,36 +1,36 @@
 {
     "smod1": {
-        "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": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x02"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (SMOD 5 (- 0 3))}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (SMOD 5 (- 0 3))}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/smod2Filler.json b/src/VMTestsFiller/vmArithmeticTest/smod2Filler.json
index 9648d54de..5882c1c1b 100644
--- a/src/VMTestsFiller/vmArithmeticTest/smod2Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/smod2Filler.json
@@ -1,36 +1,36 @@
 {
     "smod2": {
-        "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" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (SMOD (- 0 5) 3)}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (SMOD (- 0 5) 3)}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/smod3Filler.json b/src/VMTestsFiller/vmArithmeticTest/smod3Filler.json
index 3f52ab287..4c661fbca 100644
--- a/src/VMTestsFiller/vmArithmeticTest/smod3Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/smod3Filler.json
@@ -1,36 +1,36 @@
 {
     "smod3": {
-        "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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (SMOD (- 0 2) 115792089237316195423570985008687907853269984665640564039457584007913129639935)}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (SMOD (- 0 2) 115792089237316195423570985008687907853269984665640564039457584007913129639935)}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/smod4Filler.json b/src/VMTestsFiller/vmArithmeticTest/smod4Filler.json
index f09d597b9..f38370c5f 100644
--- a/src/VMTestsFiller/vmArithmeticTest/smod4Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/smod4Filler.json
@@ -1,36 +1,36 @@
 {
     "smod4": {
-        "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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (SMOD (- 0 2) 0)}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (SMOD (- 0 2) 0)}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/smod5Filler.json b/src/VMTestsFiller/vmArithmeticTest/smod5Filler.json
index b3a51f854..0e1c0631d 100644
--- a/src/VMTestsFiller/vmArithmeticTest/smod5Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/smod5Filler.json
@@ -1,36 +1,36 @@
 {
     "smod5": {
-        "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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "10000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (SMOD (- 0 57896044618658097711785492504343953926634992332820282019728792003956564819967) 57896044618658097711785492504343953926634992332820282019728792003956564819967)}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "10000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (SMOD (- 0 57896044618658097711785492504343953926634992332820282019728792003956564819967) 57896044618658097711785492504343953926634992332820282019728792003956564819967)}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/smod6Filler.json b/src/VMTestsFiller/vmArithmeticTest/smod6Filler.json
index b1a3d2dcf..f094db8fb 100644
--- a/src/VMTestsFiller/vmArithmeticTest/smod6Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/smod6Filler.json
@@ -1,29 +1,29 @@
 {
     "smod6": {
-        "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" : "{ [[ 0 ]] (SMOD (- 0 115792089237316195423570985008687907853269984665640564039457584007913129639935) 57896044618658097711785492504343953926634992332820282019728792003956564819967)}",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (SMOD (- 0 115792089237316195423570985008687907853269984665640564039457584007913129639935) 57896044618658097711785492504343953926634992332820282019728792003956564819967)}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/smod7Filler.json b/src/VMTestsFiller/vmArithmeticTest/smod7Filler.json
index 87e30d331..114267a7a 100644
--- a/src/VMTestsFiller/vmArithmeticTest/smod7Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/smod7Filler.json
@@ -1,36 +1,36 @@
 {
     "smod7": {
-        "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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "10000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (SMOD (- 0 57896044618658097711785492504343953926634992332820282019728792003956564819967) 115792089237316195423570985008687907853269984665640564039457584007913129639935)}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "10000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (SMOD (- 0 57896044618658097711785492504343953926634992332820282019728792003956564819967) 115792089237316195423570985008687907853269984665640564039457584007913129639935)}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/smod8_byZeroFiller.json b/src/VMTestsFiller/vmArithmeticTest/smod8_byZeroFiller.json
index 32883acc0..fec3013eb 100644
--- a/src/VMTestsFiller/vmArithmeticTest/smod8_byZeroFiller.json
+++ b/src/VMTestsFiller/vmArithmeticTest/smod8_byZeroFiller.json
@@ -1,29 +1,29 @@
 {
     "smod8_byZero": {
-        "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" : "{ [[ 0 ]] (- (SMOD (- 0 200) 0) 13)}",
-            "storage": {}
-        }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (- (SMOD (- 0 200) 0) 13)}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/smod_i256min1Filler.json b/src/VMTestsFiller/vmArithmeticTest/smod_i256min1Filler.json
index 9e13a80b9..4d36a7b40 100644
--- a/src/VMTestsFiller/vmArithmeticTest/smod_i256min1Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/smod_i256min1Filler.json
@@ -1,37 +1,37 @@
 {
     "smod_i256min1": {
-        "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" : "0x0000000000000000000000000000000000000000000000000000000000000000"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x0000000000000000000000000000000000000000000000000000000000000000"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-	        "_code" : "2**(256-1)",
-            "code" : "{ [[ 0 ]] (SMOD (- 0 57896044618658097711785492504343953926634992332820282019728792003956564819968) (- 0 1) )  }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "_code": "2**(256-1)",
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (SMOD (- 0 57896044618658097711785492504343953926634992332820282019728792003956564819968) (- 0 1) )  }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/smod_i256min2Filler.json b/src/VMTestsFiller/vmArithmeticTest/smod_i256min2Filler.json
index cd35cddbb..1db92a1d0 100644
--- a/src/VMTestsFiller/vmArithmeticTest/smod_i256min2Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/smod_i256min2Filler.json
@@ -1,37 +1,37 @@
 {
     "smod_i256min2": {
-        "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" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-	        "_code" : "2**(256-1)",
-            "code" : "{ [[ 0 ]] (- (SMOD (- 0 57896044618658097711785492504343953926634992332820282019728792003956564819968) (- 0 1) ) 1) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "_code": "2**(256-1)",
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (- (SMOD (- 0 57896044618658097711785492504343953926634992332820282019728792003956564819968) (- 0 1) ) 1) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/stopFiller.json b/src/VMTestsFiller/vmArithmeticTest/stopFiller.json
index effd58494..1cb10bfb5 100644
--- a/src/VMTestsFiller/vmArithmeticTest/stopFiller.json
+++ b/src/VMTestsFiller/vmArithmeticTest/stopFiller.json
@@ -1,37 +1,36 @@
 {
     "stop": {
-        "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" : "1000000000000000000",
-                "nonce" : "0",
-                "storage" : {
-                }
-            }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "0x00",
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "nonce": "0",
                 "storage": {}
             }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "0x00",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/sub0Filler.json b/src/VMTestsFiller/vmArithmeticTest/sub0Filler.json
index 9131ab589..8ecb21adb 100644
--- a/src/VMTestsFiller/vmArithmeticTest/sub0Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/sub0Filler.json
@@ -1,36 +1,36 @@
 {
     "sub0": {
-        "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" : "0x16"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x16"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (- 23 1) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (- 23 1) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/sub1Filler.json b/src/VMTestsFiller/vmArithmeticTest/sub1Filler.json
index 20bb01a22..720b581ad 100644
--- a/src/VMTestsFiller/vmArithmeticTest/sub1Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/sub1Filler.json
@@ -1,36 +1,36 @@
 {
     "sub1": {
-        "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" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (- 2 3) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (- 2 3) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/sub2Filler.json b/src/VMTestsFiller/vmArithmeticTest/sub2Filler.json
index 56cf317be..4ea9a1699 100644
--- a/src/VMTestsFiller/vmArithmeticTest/sub2Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/sub2Filler.json
@@ -1,36 +1,36 @@
 {
     "sub2": {
-        "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" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe9"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe9"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (- 0 23) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (- 0 23) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/sub3Filler.json b/src/VMTestsFiller/vmArithmeticTest/sub3Filler.json
index 04b14731b..fc96c1b62 100644
--- a/src/VMTestsFiller/vmArithmeticTest/sub3Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/sub3Filler.json
@@ -1,36 +1,36 @@
 {
     "sub3": {
-        "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" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (- 0 115792089237316195423570985008687907853269984665640564039457584007913129639935) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (- 0 115792089237316195423570985008687907853269984665640564039457584007913129639935) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmArithmeticTest/sub4Filler.json b/src/VMTestsFiller/vmArithmeticTest/sub4Filler.json
index 899b9b364..042e7b5ce 100644
--- a/src/VMTestsFiller/vmArithmeticTest/sub4Filler.json
+++ b/src/VMTestsFiller/vmArithmeticTest/sub4Filler.json
@@ -1,36 +1,36 @@
 {
     "sub4": {
-        "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" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f2947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (- 115792089237316195423570985008687907853269984665640564039457584007913129639935 0) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f2947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ [[ 0 ]] (- 115792089237316195423570985008687907853269984665640564039457584007913129639935 0) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBitwiseLogicOperation/and0Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/and0Filler.json
index db07eb388..c9373fa82 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/and0Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/and0Filler.json
@@ -1,36 +1,36 @@
 {
     "and0": {
-        "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" : "1000000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (AND 2 2) }",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (AND 2 2) }",
+                "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/vmBitwiseLogicOperation/and1Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/and1Filler.json
index d6f804033..94dcc30cb 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/and1Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/and1Filler.json
@@ -1,35 +1,34 @@
 {
     "and1": {
-        "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" : "1000000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (AND 2 1) }",
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
                 "storage": {}
             }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (AND 2 1) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBitwiseLogicOperation/and2Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/and2Filler.json
index be818473e..204de2203 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/and2Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/and2Filler.json
@@ -1,36 +1,36 @@
 {
     "and2": {
-        "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" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (AND 3 1) }",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (AND 3 1) }",
+                "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/vmBitwiseLogicOperation/and3Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/and3Filler.json
index d695fdcec..665ad416f 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/and3Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/and3Filler.json
@@ -1,36 +1,36 @@
 {
     "and3": {
-        "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" : "0x0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (AND 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0x0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (AND 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0x0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef) } ",
+                "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/vmBitwiseLogicOperation/and4Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/and4Filler.json
index 2f3440756..3ea9a2c19 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/and4Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/and4Filler.json
@@ -1,36 +1,36 @@
 {
     "and4": {
-        "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" : "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (AND 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (AND 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) } ",
+                "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/vmBitwiseLogicOperation/and5Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/and5Filler.json
index ec12e07a0..3996a4264 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/and5Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/and5Filler.json
@@ -1,36 +1,36 @@
 {
     "and5": {
-        "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" : "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeefeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeefeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (AND 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeefeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (AND 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeefeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) } ",
+                "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/vmBitwiseLogicOperation/byte0Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/byte0Filler.json
index 57d808f76..c5f8ad574 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/byte0Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/byte0Filler.json
@@ -1,36 +1,36 @@
 {
     "byte0": {
-        "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" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (BYTE (- 31 0) 0x8040201008040201 ) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (BYTE (- 31 0) 0x8040201008040201 ) } ",
+                "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/vmBitwiseLogicOperation/byte10Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/byte10Filler.json
index 23df00564..a2a302feb 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/byte10Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/byte10Filler.json
@@ -1,35 +1,34 @@
 {
     "byte10": {
-        "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" : "1000000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (BYTE 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0x8040201008040201 ) } ",
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
                 "storage": {}
             }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (BYTE 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0x8040201008040201 ) } ",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBitwiseLogicOperation/byte11Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/byte11Filler.json
index 3d8d3d354..f59a1c655 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/byte11Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/byte11Filler.json
@@ -1,35 +1,34 @@
 {
     "byte11": {
-        "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" : "1000000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (BYTE 0 0x8040201008040201) } ",
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
                 "storage": {}
             }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (BYTE 0 0x8040201008040201) } ",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBitwiseLogicOperation/byte1Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/byte1Filler.json
index 0749aa40a..a2f56da88 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/byte1Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/byte1Filler.json
@@ -1,36 +1,36 @@
 {
     "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"
         },
-        "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" : "1000000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (BYTE (- 31 1) 0x8040201008040201 ) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (BYTE (- 31 1) 0x8040201008040201 ) } ",
+                "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/vmBitwiseLogicOperation/byte2Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/byte2Filler.json
index 043c401f7..038ade78b 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/byte2Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/byte2Filler.json
@@ -1,36 +1,36 @@
 {
     "byte2": {
-        "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" : "0x04"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x04"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (BYTE (- 31 2) 0x8040201008040201 ) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (BYTE (- 31 2) 0x8040201008040201 ) } ",
+                "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/vmBitwiseLogicOperation/byte3Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/byte3Filler.json
index 31b55656b..2061bdb07 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/byte3Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/byte3Filler.json
@@ -1,36 +1,36 @@
 {
     "byte3": {
-        "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" : "0x08"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x08"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (BYTE (- 31 3) 0x8040201008040201 ) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (BYTE (- 31 3) 0x8040201008040201 ) } ",
+                "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/vmBitwiseLogicOperation/byte4Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/byte4Filler.json
index a7e0022c9..98d54c433 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/byte4Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/byte4Filler.json
@@ -1,36 +1,36 @@
 {
     "byte4": {
-        "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" : "0x10"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x10"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (BYTE (- 31 4) 0x8040201008040201 ) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (BYTE (- 31 4) 0x8040201008040201 ) } ",
+                "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/vmBitwiseLogicOperation/byte5Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/byte5Filler.json
index 4db863110..30e3b0dac 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/byte5Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/byte5Filler.json
@@ -1,36 +1,36 @@
 {
     "byte5": {
-        "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" : "1000000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (BYTE (- 31 5) 0x8040201008040201 ) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (BYTE (- 31 5) 0x8040201008040201 ) } ",
+                "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/vmBitwiseLogicOperation/byte6Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/byte6Filler.json
index 37798db1e..ae178a71a 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/byte6Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/byte6Filler.json
@@ -1,36 +1,36 @@
 {
     "byte6": {
-        "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" : "1000000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (BYTE (- 31 6) 0x8040201008040201 ) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (BYTE (- 31 6) 0x8040201008040201 ) } ",
+                "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/vmBitwiseLogicOperation/byte7Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/byte7Filler.json
index 9e504699f..98181d22b 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/byte7Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/byte7Filler.json
@@ -1,36 +1,36 @@
 {
     "byte7": {
-        "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" : "1000000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (BYTE (- 31 7) 0x8040201008040201 ) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (BYTE (- 31 7) 0x8040201008040201 ) } ",
+                "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/vmBitwiseLogicOperation/byte8Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/byte8Filler.json
index 890d39364..36cdc30e4 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/byte8Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/byte8Filler.json
@@ -1,35 +1,34 @@
 {
     "byte8": {
-        "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" : "1000000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (BYTE (- 31 31) 0x8040201008040201 ) } ",
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
                 "storage": {}
             }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (BYTE (- 31 31) 0x8040201008040201 ) } ",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBitwiseLogicOperation/byte9Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/byte9Filler.json
index e9c39bddc..9f2f572af 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/byte9Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/byte9Filler.json
@@ -1,35 +1,34 @@
 {
     "byte9": {
-        "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" : "1000000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (BYTE (SDIV 31 32) 0x8040201008040201 ) } ",
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
                 "storage": {}
             }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (BYTE (SDIV 31 32) 0x8040201008040201 ) } ",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBitwiseLogicOperation/byteBNFiller.json b/src/VMTestsFiller/vmBitwiseLogicOperation/byteBNFiller.json
index 97e5f46e7..5d0b100aa 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/byteBNFiller.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/byteBNFiller.json
@@ -1,36 +1,36 @@
 {
     "byteBN": {
-        "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" : {
-                    "0x1" : "0xac"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x1": "0xac"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000000000",
-                "nonce" : "0",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
                 "code": "{ (asm 0x1234523456 31 BYTE DUP1 ADD 0x01 SSTORE )}",
+                "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/vmBitwiseLogicOperation/eq0Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/eq0Filler.json
index 064dcbc0d..546680e9e 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/eq0Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/eq0Filler.json
@@ -1,35 +1,34 @@
 {
     "eq0": {
-        "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" : "1000000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EQ (- 0 5) (- 0 3) )}",
-            "storage": {}
-        }
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {}
+            }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (EQ (- 0 5) (- 0 3) )}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBitwiseLogicOperation/eq1Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/eq1Filler.json
index a460d696f..f7ae0e62c 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/eq1Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/eq1Filler.json
@@ -1,36 +1,36 @@
 {
     "eq1": {
-        "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" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EQ 0 0)}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (EQ 0 0)}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBitwiseLogicOperation/eq2Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/eq2Filler.json
index 637e6d6a8..257a11a38 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/eq2Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/eq2Filler.json
@@ -1,36 +1,36 @@
 {
     "eq2": {
-        "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" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (EQ 115792089237316195423570985008687907853269984665640564039457584007913129639935 115792089237316195423570985008687907853269984665640564039457584007913129639935 )}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (EQ 115792089237316195423570985008687907853269984665640564039457584007913129639935 115792089237316195423570985008687907853269984665640564039457584007913129639935 )}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBitwiseLogicOperation/gt0Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/gt0Filler.json
index ede438bd3..d0766ec6f 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/gt0Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/gt0Filler.json
@@ -1,36 +1,36 @@
 {
     "gt0": {
-        "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" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] ( GT (- 0 2) 0 )}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] ( GT (- 0 2) 0 )}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBitwiseLogicOperation/gt1Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/gt1Filler.json
index ad11d4d8e..95fc513c3 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/gt1Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/gt1Filler.json
@@ -1,35 +1,34 @@
 {
     "gt1": {
-        "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" : "1000000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (GT 0 (- 0 2) )}",
-            "storage": {}
-        }
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {}
+            }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (GT 0 (- 0 2) )}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBitwiseLogicOperation/gt2Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/gt2Filler.json
index 13331a055..ac9a6983b 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/gt2Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/gt2Filler.json
@@ -1,36 +1,36 @@
 {
     "gt2": {
-        "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" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (GT 115792089237316195423570985008687907853269984665640564039457584007913129639935 0 )}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (GT 115792089237316195423570985008687907853269984665640564039457584007913129639935 0 )}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBitwiseLogicOperation/gt3Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/gt3Filler.json
index d769c4373..2ff51ac10 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/gt3Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/gt3Filler.json
@@ -1,35 +1,34 @@
 {
     "gt3": {
-        "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" : "1000000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (GT 0 115792089237316195423570985008687907853269984665640564039457584007913129639935 )}",
-            "storage": {}
-        }
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {}
+            }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (GT 0 115792089237316195423570985008687907853269984665640564039457584007913129639935 )}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBitwiseLogicOperation/iszeo2Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/iszeo2Filler.json
index 4d642d2fd..fb1c8235e 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/iszeo2Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/iszeo2Filler.json
@@ -1,36 +1,36 @@
 {
     "iszeo2": {
-        "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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (ISZERO (- 0 2) )}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (ISZERO (- 0 2) )}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBitwiseLogicOperation/iszero0Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/iszero0Filler.json
index 602057457..9938520f1 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/iszero0Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/iszero0Filler.json
@@ -1,36 +1,36 @@
 {
     "iszero0": {
-        "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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (ISZERO 115792089237316195423570985008687907853269984665640564039457584007913129639935 )}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (ISZERO 115792089237316195423570985008687907853269984665640564039457584007913129639935 )}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBitwiseLogicOperation/iszero1Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/iszero1Filler.json
index cb4629e4b..6aa221b7d 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/iszero1Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/iszero1Filler.json
@@ -1,36 +1,36 @@
 {
     "iszero1": {
-        "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" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (ISZERO 0 )}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (ISZERO 0 )}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBitwiseLogicOperation/lt0Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/lt0Filler.json
index e8cd1717a..f865350ac 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/lt0Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/lt0Filler.json
@@ -1,35 +1,34 @@
 {
     "lt0": {
-        "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": "10000000000000000000"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (LT (- 0 2) 0 )}",
-            "storage": {}
-        }
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {}
+            }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "10000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ [[ 0 ]] (LT (- 0 2) 0 )}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBitwiseLogicOperation/lt1Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/lt1Filler.json
index 7b808956b..f3930e95f 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/lt1Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/lt1Filler.json
@@ -1,36 +1,36 @@
 {
     "lt1": {
-        "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" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "10000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "10000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (LT 0 (- 0 2) )}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "10000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "10000000000000000000",
+                "code": "{ [[ 0 ]] (LT 0 (- 0 2) )}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBitwiseLogicOperation/lt2Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/lt2Filler.json
index c8047adfd..2b3ffa7de 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/lt2Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/lt2Filler.json
@@ -1,35 +1,34 @@
 {
     "lt2": {
-        "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": "10000000000000000000"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "10000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (LT 115792089237316195423570985008687907853269984665640564039457584007913129639935 0 )}",
-            "storage": {}
-        }
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {}
+            }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "10000000000000000000",
-            "data" : "",  
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "10000000000000000000",
+                "code": "{ [[ 0 ]] (LT 115792089237316195423570985008687907853269984665640564039457584007913129639935 0 )}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBitwiseLogicOperation/lt3Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/lt3Filler.json
index 457a538cb..df85ac07d 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/lt3Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/lt3Filler.json
@@ -1,36 +1,36 @@
 {
     "lt3": {
-        "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" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (LT 0 115792089237316195423570985008687907853269984665640564039457584007913129639935 )}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (LT 0 115792089237316195423570985008687907853269984665640564039457584007913129639935 )}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBitwiseLogicOperation/not0Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/not0Filler.json
index ff8a08bbe..139c5c4f6 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/not0Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/not0Filler.json
@@ -1,36 +1,36 @@
 {
     "not0": {
-        "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" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (NOT 0)}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (NOT 0)}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBitwiseLogicOperation/not1Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/not1Filler.json
index e0d77c8f8..6acaad1c4 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/not1Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/not1Filler.json
@@ -1,36 +1,36 @@
 {
     "not1": {
-        "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" : {
-		    "0x00" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x00": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (NOT 2) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (NOT 2) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBitwiseLogicOperation/not2Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/not2Filler.json
index 564c45a08..63ebdd39f 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/not2Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/not2Filler.json
@@ -1,35 +1,34 @@
 {
     "not2": {
-        "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" : "1000000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (NOT 115792089237316195423570985008687907853269984665640564039457584007913129639935 )}",
-            "storage": {}
-        }
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {}
+            }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (NOT 115792089237316195423570985008687907853269984665640564039457584007913129639935 )}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBitwiseLogicOperation/not3Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/not3Filler.json
index 64d582237..d285df171 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/not3Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/not3Filler.json
@@ -1,36 +1,36 @@
 {
     "not3": {
-        "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" : {
-		    "0x00" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x00": "0x01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (NOT (- 0 2) )}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (NOT (- 0 2) )}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBitwiseLogicOperation/not4Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/not4Filler.json
index cc92f3f45..336f0372b 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/not4Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/not4Filler.json
@@ -1,36 +1,36 @@
 {
     "not4": {
-        "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" : {
-		    "0x00" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x00": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (NOT (- 0 115792089237316195423570985008687907853269984665640564039457584007913129639935) )}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (NOT (- 0 115792089237316195423570985008687907853269984665640564039457584007913129639935) )}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBitwiseLogicOperation/not5Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/not5Filler.json
index 7d85968c5..5793bd2d7 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/not5Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/not5Filler.json
@@ -1,36 +1,36 @@
 {
     "not5": {
-        "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" : {
-		    "0x00" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x00": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (NOT (- 0 0) )}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (NOT (- 0 0) )}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBitwiseLogicOperation/or0Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/or0Filler.json
index dba33d7b0..0d2a3c8cb 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/or0Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/or0Filler.json
@@ -1,36 +1,36 @@
 {
     "or0": {
-        "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" : "1000000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (OR 2 2) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (OR 2 2) } ",
+                "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/vmBitwiseLogicOperation/or1Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/or1Filler.json
index 2dd3833da..b0424982d 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/or1Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/or1Filler.json
@@ -1,36 +1,36 @@
 {
     "or1": {
-        "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" : "0x03"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x03"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (OR 2 1) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (OR 2 1) } ",
+                "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/vmBitwiseLogicOperation/or2Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/or2Filler.json
index 854e21125..44c2ea2e8 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/or2Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/or2Filler.json
@@ -1,36 +1,36 @@
 {
     "or2": {
-        "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" : "0x03"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x03"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (OR 3 1) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (OR 3 1) } ",
+                "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/vmBitwiseLogicOperation/or3Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/or3Filler.json
index 7dbbb1983..ba85521cd 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/or3Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/or3Filler.json
@@ -1,36 +1,36 @@
 {
     "or3": {
-        "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" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (OR 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0x0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (OR 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0x0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef) } ",
+                "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/vmBitwiseLogicOperation/or4Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/or4Filler.json
index bffb7c1b3..dc9a6cc8e 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/or4Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/or4Filler.json
@@ -1,36 +1,36 @@
 {
     "or4": {
-        "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" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (OR 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (OR 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) } ",
+                "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/vmBitwiseLogicOperation/or5Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/or5Filler.json
index 8177005fc..29f190981 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/or5Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/or5Filler.json
@@ -1,36 +1,36 @@
 {
     "or5": {
-        "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" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (OR 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeefeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (OR 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeefeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) } ",
+                "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/vmBitwiseLogicOperation/sgt0Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/sgt0Filler.json
index f39e9a120..52bfd133f 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/sgt0Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/sgt0Filler.json
@@ -1,35 +1,34 @@
 {
     "sgt0": {
-        "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" : "1000000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (SGT (- 0 2) 0 )}",
-            "storage": {}
-        }
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {}
+            }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (SGT (- 0 2) 0 )}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBitwiseLogicOperation/sgt1Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/sgt1Filler.json
index cac9ab2a0..ef5bb50fb 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/sgt1Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/sgt1Filler.json
@@ -1,36 +1,36 @@
 {
     "sgt1": {
-        "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" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (SGT 0 (- 0 2) )}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (SGT 0 (- 0 2) )}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBitwiseLogicOperation/sgt2Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/sgt2Filler.json
index d78e5f5e8..3a20e41be 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/sgt2Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/sgt2Filler.json
@@ -1,35 +1,34 @@
 {
     "sgt2": {
-        "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" : "1000000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (SGT 115792089237316195423570985008687907853269984665640564039457584007913129639935 0 )}",
-            "storage": {}
-        }
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {}
+            }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (SGT 115792089237316195423570985008687907853269984665640564039457584007913129639935 0 )}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBitwiseLogicOperation/sgt3Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/sgt3Filler.json
index 3fff182dc..ddf1f0182 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/sgt3Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/sgt3Filler.json
@@ -1,36 +1,36 @@
 {
     "sgt3": {
-        "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" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (SGT 0 115792089237316195423570985008687907853269984665640564039457584007913129639935 )}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (SGT 0 115792089237316195423570985008687907853269984665640564039457584007913129639935 )}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBitwiseLogicOperation/sgt4Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/sgt4Filler.json
index d6b0e2e97..58a8be6f1 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/sgt4Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/sgt4Filler.json
@@ -1,35 +1,34 @@
 {
     "sgt4": {
-        "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" : "1000000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (SGT (- 0 5) (- 0 3) )}",
-            "storage": {}
-        }
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {}
+            }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (SGT (- 0 5) (- 0 3) )}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBitwiseLogicOperation/slt0Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/slt0Filler.json
index 12c31939b..ffa17e294 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/slt0Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/slt0Filler.json
@@ -1,36 +1,36 @@
 {
     "slt0": {
-        "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" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (SLT (- 0 2) 0 )}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (SLT (- 0 2) 0 )}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBitwiseLogicOperation/slt1Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/slt1Filler.json
index 16974531a..44d61b48f 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/slt1Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/slt1Filler.json
@@ -1,35 +1,34 @@
 {
     "slt1": {
-        "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" : "1000000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (SLT 0 (- 0 2) )}",
-            "storage": {}
-        }
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {}
+            }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (SLT 0 (- 0 2) )}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBitwiseLogicOperation/slt2Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/slt2Filler.json
index 972913bf0..b1a355eb3 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/slt2Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/slt2Filler.json
@@ -1,36 +1,36 @@
 {
     "slt2": {
-        "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" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (SLT 115792089237316195423570985008687907853269984665640564039457584007913129639935 0 )}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (SLT 115792089237316195423570985008687907853269984665640564039457584007913129639935 0 )}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBitwiseLogicOperation/slt3Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/slt3Filler.json
index 3e7f7bc6a..4ae518fd3 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/slt3Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/slt3Filler.json
@@ -1,35 +1,34 @@
 {
     "slt3": {
-        "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" : "1000000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (SLT 0 115792089237316195423570985008687907853269984665640564039457584007913129639935 )}",
-            "storage": {}
-        }
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {}
+            }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (SLT 0 115792089237316195423570985008687907853269984665640564039457584007913129639935 )}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBitwiseLogicOperation/slt4Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/slt4Filler.json
index 657b1b411..22c72d1ed 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/slt4Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/slt4Filler.json
@@ -1,36 +1,36 @@
 {
     "slt4": {
-        "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" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "1000000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (SLT (- 0 5) (- 0 3) )}",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (SLT (- 0 5) (- 0 3) )}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBitwiseLogicOperation/xor0Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/xor0Filler.json
index 475a94243..1c9ea1933 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/xor0Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/xor0Filler.json
@@ -1,35 +1,34 @@
 {
     "xor0": {
-        "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" : "1000000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (XOR 2 2) } ",
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
                 "storage": {}
             }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (XOR 2 2) } ",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBitwiseLogicOperation/xor1Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/xor1Filler.json
index 8b7212df1..881b397a4 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/xor1Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/xor1Filler.json
@@ -1,36 +1,36 @@
 {
     "xor1": {
-        "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" : "0x03"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x03"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (XOR 2 1) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (XOR 2 1) } ",
+                "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/vmBitwiseLogicOperation/xor2Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/xor2Filler.json
index d00980e4b..d7b3f4a7f 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/xor2Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/xor2Filler.json
@@ -1,36 +1,36 @@
 {
     "xor2": {
-        "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" : "1000000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (XOR 3 1) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (XOR 3 1) } ",
+                "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/vmBitwiseLogicOperation/xor3Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/xor3Filler.json
index 30b53f546..4c9e953db 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/xor3Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/xor3Filler.json
@@ -1,36 +1,36 @@
 {
     "xor3": {
-        "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" : "0xfedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xfedcba9876543210fedcba9876543210fedcba9876543210fedcba9876543210"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (XOR 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0x0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (XOR 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0x0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef) } ",
+                "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/vmBitwiseLogicOperation/xor4Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/xor4Filler.json
index 53c6f6f8c..876d723ad 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/xor4Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/xor4Filler.json
@@ -1,36 +1,36 @@
 {
     "xor4": {
-        "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" : "0x1111111111111111111111111111111111111111111111111111111111111111"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x1111111111111111111111111111111111111111111111111111111111111111"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (XOR 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (XOR 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) } ",
+                "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/vmBitwiseLogicOperation/xor5Filler.json b/src/VMTestsFiller/vmBitwiseLogicOperation/xor5Filler.json
index 42fc4bb89..f3430c205 100644
--- a/src/VMTestsFiller/vmBitwiseLogicOperation/xor5Filler.json
+++ b/src/VMTestsFiller/vmBitwiseLogicOperation/xor5Filler.json
@@ -1,36 +1,36 @@
 {
     "xor5": {
-        "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" : "0x1111111111111111111111111111101111111111111111111111111111111111"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x1111111111111111111111111111101111111111111111111111111111111111"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (XOR 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeefeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) } ",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000000000",
+                "code": "{ [[ 0 ]] (XOR 0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeefeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) } ",
+                "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/vmBlockInfoTest/coinbaseFiller.json b/src/VMTestsFiller/vmBlockInfoTest/coinbaseFiller.json
index f0345206b..513cb3a05 100644
--- a/src/VMTestsFiller/vmBlockInfoTest/coinbaseFiller.json
+++ b/src/VMTestsFiller/vmBlockInfoTest/coinbaseFiller.json
@@ -1,36 +1,36 @@
 {
     "coinbase": {
-        "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" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (COINBASE) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ [[ 0 ]] (COINBASE) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBlockInfoTest/difficultyFiller.json b/src/VMTestsFiller/vmBlockInfoTest/difficultyFiller.json
index 17c864d4b..2d37aa52b 100644
--- a/src/VMTestsFiller/vmBlockInfoTest/difficultyFiller.json
+++ b/src/VMTestsFiller/vmBlockInfoTest/difficultyFiller.json
@@ -1,36 +1,36 @@
 {
     "difficulty": {
-        "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" : "0x0100"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x0100"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (DIFFICULTY) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ [[ 0 ]] (DIFFICULTY) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBlockInfoTest/gaslimitFiller.json b/src/VMTestsFiller/vmBlockInfoTest/gaslimitFiller.json
index caf8a162a..146563fb3 100644
--- a/src/VMTestsFiller/vmBlockInfoTest/gaslimitFiller.json
+++ b/src/VMTestsFiller/vmBlockInfoTest/gaslimitFiller.json
@@ -1,36 +1,36 @@
 {
     "gaslimit": {
-        "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" : "0x0f4240"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x0f4240"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (GASLIMIT) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ [[ 0 ]] (GASLIMIT) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBlockInfoTest/numberFiller.json b/src/VMTestsFiller/vmBlockInfoTest/numberFiller.json
index de7f23685..baf1bdb22 100644
--- a/src/VMTestsFiller/vmBlockInfoTest/numberFiller.json
+++ b/src/VMTestsFiller/vmBlockInfoTest/numberFiller.json
@@ -1,36 +1,36 @@
 {
     "number": {
-        "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" : {
-		     "0x" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (NUMBER) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ [[ 0 ]] (NUMBER) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmBlockInfoTest/timestampFiller.json b/src/VMTestsFiller/vmBlockInfoTest/timestampFiller.json
index 0e51ca385..f641aea91 100644
--- a/src/VMTestsFiller/vmBlockInfoTest/timestampFiller.json
+++ b/src/VMTestsFiller/vmBlockInfoTest/timestampFiller.json
@@ -1,36 +1,36 @@
 {
     "timestamp": {
-        "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" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x01"
                 }
             }
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ [[ 0 ]] (TIMESTAMP) }",
-            "storage": {}
-        }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ [[ 0 ]] (TIMESTAMP) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmEnvironmentalInfo/address0Filler.json b/src/VMTestsFiller/vmEnvironmentalInfo/address0Filler.json
index 154f1821a..019797205 100644
--- a/src/VMTestsFiller/vmEnvironmentalInfo/address0Filler.json
+++ b/src/VMTestsFiller/vmEnvironmentalInfo/address0Filler.json
@@ -1,36 +1,36 @@
 {
     "address0": {
-        "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" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000000000",
+            "gasPrice": "1000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (ADDRESS)}",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ [[ 0 ]] (ADDRESS)}",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "1000000000",
-            "gas" : "100000000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmEnvironmentalInfo/address1Filler.json b/src/VMTestsFiller/vmEnvironmentalInfo/address1Filler.json
index 76307c7db..b50ac0b33 100644
--- a/src/VMTestsFiller/vmEnvironmentalInfo/address1Filler.json
+++ b/src/VMTestsFiller/vmEnvironmentalInfo/address1Filler.json
@@ -1,36 +1,36 @@
 {
     "address1": {
-        "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" : {
-            "cd1722f3947def4cf144679da39c4c32bdc35681" : {
-                "storage" : {
-                    "0x" : "0xcd1722f3947def4cf144679da39c4c32bdc35681"
+        "exec": {
+            "address": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "data": "",
+            "gas": "100000000000",
+            "gasPrice": "1000000000",
+            "origin": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "cd1722f3947def4cf144679da39c4c32bdc35681": {
+                "storage": {
+                    "0x": "0xcd1722f3947def4cf144679da39c4c32bdc35681"
                 }
             }
         },
-        "pre" : {
-            "cd1722f3947def4cf144679da39c4c32bdc35681" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (ADDRESS)}",
+        "pre": {
+            "cd1722f3947def4cf144679da39c4c32bdc35681": {
+                "balance": "100000000000000000000000",
+                "code": "{ [[ 0 ]] (ADDRESS)}",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "origin" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "caller" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "1000000000",
-            "gas" : "100000000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy0Filler.json b/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy0Filler.json
index 540051fd2..e065ee3ea 100644
--- a/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy0Filler.json
+++ b/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy0Filler.json
@@ -1,36 +1,36 @@
 {
     "calldatacopy0": {
-        "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" : "0x3456000000000000000000000000000000000000000000000000000000000000"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "0x1234567890abcdef01234567890abcdef0",
+            "gas": "100000000000",
+            "gasPrice": "1000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x3456000000000000000000000000000000000000000000000000000000000000"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ (CALLDATACOPY 0 1 2 ) [[ 0 ]] @0}",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ (CALLDATACOPY 0 1 2 ) [[ 0 ]] @0}",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "0x1234567890abcdef01234567890abcdef0",
-            "gasPrice" : "1000000000",
-            "gas" : "100000000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy0_returnFiller.json b/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy0_returnFiller.json
index 448766c71..e3ca94969 100644
--- a/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy0_returnFiller.json
+++ b/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy0_returnFiller.json
@@ -1,36 +1,36 @@
 {
     "calldatacopy0_return": {
-        "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" : "0x3456000000000000000000000000000000000000000000000000000000000000"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "0x1234567890abcdef01234567890abcdef0",
+            "gas": "100000000000",
+            "gasPrice": "1000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x3456000000000000000000000000000000000000000000000000000000000000"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "{ (CALLDATACOPY 0 1 2 ) [[0]] (MLOAD 0) (RETURN 0 (MSIZE))}",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ (CALLDATACOPY 0 1 2 ) [[0]] (MLOAD 0) (RETURN 0 (MSIZE))}",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "0x1234567890abcdef01234567890abcdef0",
-            "gasPrice" : "1000000000",
-            "gas" : "100000000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy1Filler.json b/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy1Filler.json
index f898f4e49..91018582d 100644
--- a/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy1Filler.json
+++ b/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy1Filler.json
@@ -1,36 +1,36 @@
 {
     "calldatacopy1": {
-        "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" : "0x3400000000000000000000000000000000000000000000000000000000000000"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "0x1234567890abcdef01234567890abcdef0",
+            "gas": "100000000000",
+            "gasPrice": "1000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x3400000000000000000000000000000000000000000000000000000000000000"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ (CALLDATACOPY 0 1 1 ) [[ 0 ]] @0}",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ (CALLDATACOPY 0 1 1 ) [[ 0 ]] @0}",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "0x1234567890abcdef01234567890abcdef0",
-            "gasPrice" : "1000000000",
-            "gas" : "100000000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy1_returnFiller.json b/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy1_returnFiller.json
index 49abb5b3d..f2649a15e 100644
--- a/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy1_returnFiller.json
+++ b/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy1_returnFiller.json
@@ -1,36 +1,36 @@
 {
     "calldatacopy1_return": {
-        "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"
         },
-        "export" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x" : "0x2300000000000000000000000000000000000000000000000000000000000000"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "0x1234567890abcdef01234567890abcdef0",
+            "gas": "100000000000",
+            "gasPrice": "1000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "export": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x2300000000000000000000000000000000000000000000000000000000000000"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "{ (CALLDATACOPY 0 1 1 ) [[0]] (MLOAD 0) (RETURN 0 (MSIZE))}",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ (CALLDATACOPY 0 1 1 ) [[0]] (MLOAD 0) (RETURN 0 (MSIZE))}",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "0x1234567890abcdef01234567890abcdef0",
-            "gasPrice" : "1000000000",
-            "gas" : "100000000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy2Filler.json b/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy2Filler.json
index 427ac1ef7..717364ade 100644
--- a/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy2Filler.json
+++ b/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy2Filler.json
@@ -1,35 +1,34 @@
 {
     "calldatacopy2": {
-        "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": "0x1234567890abcdef01234567890abcdef0",
+            "gas": "100000000000",
+            "gasPrice": "1000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ (CALLDATACOPY 0 1 0 ) [[ 0 ]] @0}",
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
                 "storage": {}
             }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "0x1234567890abcdef01234567890abcdef0",
-            "gasPrice" : "1000000000",
-            "gas" : "100000000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ (CALLDATACOPY 0 1 0 ) [[ 0 ]] @0}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy2_returnFiller.json b/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy2_returnFiller.json
index 80a55610d..a996114c6 100644
--- a/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy2_returnFiller.json
+++ b/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy2_returnFiller.json
@@ -1,35 +1,34 @@
 {
     "calldatacopy2_return": {
-        "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": "0x1234567890abcdef01234567890abcdef0",
+            "gas": "100000000000",
+            "gasPrice": "1000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "{ (CALLDATACOPY 0 1 0 ) [[0]] (MLOAD 0) (RETURN 0 (MSIZE))}",
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
                 "storage": {}
             }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "0x1234567890abcdef01234567890abcdef0",
-            "gasPrice" : "1000000000",
-            "gas" : "100000000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ (CALLDATACOPY 0 1 0 ) [[0]] (MLOAD 0) (RETURN 0 (MSIZE))}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopyUnderFlowFiller.json b/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopyUnderFlowFiller.json
index 7101fb0da..06b2c078b 100644
--- a/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopyUnderFlowFiller.json
+++ b/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopyUnderFlowFiller.json
@@ -1,35 +1,34 @@
 {
     "calldatacopyUnderFlow": {
-        "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": "0x1234567890abcdef01234567890abcdef0",
+            "gas": "100000000000",
+            "gasPrice": "1000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "(asm 1 2 CALLDATACOPY)",
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
                 "storage": {}
             }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "0x1234567890abcdef01234567890abcdef0",
-            "gasPrice" : "1000000000",
-            "gas" : "100000000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "(asm 1 2 CALLDATACOPY)",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopyZeroMemExpansionFiller.json b/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopyZeroMemExpansionFiller.json
index bf91ac3fc..85eb7da50 100644
--- a/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopyZeroMemExpansionFiller.json
+++ b/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopyZeroMemExpansionFiller.json
@@ -1,35 +1,34 @@
 {
     "calldatacopyZeroMemExpansion": {
-        "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": "0x1234567890abcdef01234567890abcdef0",
+            "gas": "100000000000",
+            "gasPrice": "1000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ (CALLDATACOPY 0 0 0 ) [[ 0 ]] @0}",
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
                 "storage": {}
             }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "0x1234567890abcdef01234567890abcdef0",
-            "gasPrice" : "1000000000",
-            "gas" : "100000000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ (CALLDATACOPY 0 0 0 ) [[ 0 ]] @0}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopyZeroMemExpansion_returnFiller.json b/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopyZeroMemExpansion_returnFiller.json
index e25107fe2..7d077c2f3 100644
--- a/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopyZeroMemExpansion_returnFiller.json
+++ b/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopyZeroMemExpansion_returnFiller.json
@@ -1,36 +1,36 @@
 {
     "calldatacopyZeroMemExpansion_return": {
-        "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" : "0x00"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "0x1234567890abcdef01234567890abcdef0",
+            "gas": "100000000000",
+            "gasPrice": "1000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x00"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "{ (CALLDATACOPY 0 0 0 ) [[0]] (MLOAD 0) (RETURN 0 (MSIZE))}",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ (CALLDATACOPY 0 0 0 ) [[0]] (MLOAD 0) (RETURN 0 (MSIZE))}",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "0x1234567890abcdef01234567890abcdef0",
-            "gasPrice" : "1000000000",
-            "gas" : "100000000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy_DataIndexTooHigh2Filler.json b/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy_DataIndexTooHigh2Filler.json
index 2a3f74e1c..06b27df9c 100644
--- a/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy_DataIndexTooHigh2Filler.json
+++ b/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy_DataIndexTooHigh2Filler.json
@@ -1,35 +1,34 @@
 {
     "calldatacopy_DataIndexTooHigh2": {
-        "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": "0x1234567890abcdef01234567890abcdef0",
+            "gas": "100000000000",
+            "gasPrice": "1000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ (CALLDATACOPY 0 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa 9 ) [[ 0 ]] @0}",
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
                 "storage": {}
             }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "0x1234567890abcdef01234567890abcdef0",
-            "gasPrice" : "1000000000",
-            "gas" : "100000000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ (CALLDATACOPY 0 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa 9 ) [[ 0 ]] @0}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy_DataIndexTooHigh2_returnFiller.json b/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy_DataIndexTooHigh2_returnFiller.json
index 82d4e2c27..3307c7db5 100644
--- a/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy_DataIndexTooHigh2_returnFiller.json
+++ b/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy_DataIndexTooHigh2_returnFiller.json
@@ -1,35 +1,34 @@
 {
     "calldatacopy_DataIndexTooHigh2_return": {
-        "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": "0x1234567890abcdef01234567890abcdef0",
+            "gas": "100000000000",
+            "gasPrice": "1000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "{ (CALLDATACOPY 0 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa 9 ) [[0]] (MLOAD 0) (RETURN 0 (MSIZE))}",
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
                 "storage": {}
             }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "0x1234567890abcdef01234567890abcdef0",
-            "gasPrice" : "1000000000",
-            "gas" : "100000000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ (CALLDATACOPY 0 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa 9 ) [[0]] (MLOAD 0) (RETURN 0 (MSIZE))}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy_DataIndexTooHighFiller.json b/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy_DataIndexTooHighFiller.json
index 8dcc6c0c1..8f5222d6d 100644
--- a/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy_DataIndexTooHighFiller.json
+++ b/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy_DataIndexTooHighFiller.json
@@ -1,35 +1,34 @@
 {
     "calldatacopy_DataIndexTooHigh": {
-        "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": "0x1234567890abcdef01234567890abcdef0",
+            "gas": "100000000000",
+            "gasPrice": "1000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ (CALLDATACOPY 0 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa 0xff ) [[ 0 ]] @0}",
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
                 "storage": {}
             }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "0x1234567890abcdef01234567890abcdef0",
-            "gasPrice" : "1000000000",
-            "gas" : "100000000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ (CALLDATACOPY 0 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa 0xff ) [[ 0 ]] @0}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy_DataIndexTooHigh_returnFiller.json b/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy_DataIndexTooHigh_returnFiller.json
index 410d80663..69944d1cb 100644
--- a/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy_DataIndexTooHigh_returnFiller.json
+++ b/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy_DataIndexTooHigh_returnFiller.json
@@ -1,35 +1,34 @@
 {
     "calldatacopy_DataIndexTooHigh_return": {
-        "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": "0x1234567890abcdef01234567890abcdef0",
+            "gas": "100000000000",
+            "gasPrice": "1000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "{ (CALLDATACOPY 0 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa 0xff ) [[0]] (MLOAD 0) (RETURN 0 (MSIZE))}",
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
                 "storage": {}
             }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "0x1234567890abcdef01234567890abcdef0",
-            "gasPrice" : "1000000000",
-            "gas" : "100000000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "{ (CALLDATACOPY 0 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa 0xff ) [[0]] (MLOAD 0) (RETURN 0 (MSIZE))}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy_secFiller.json b/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy_secFiller.json
index 1dcb8e342..5e01ac6c4 100644
--- a/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy_secFiller.json
+++ b/src/VMTestsFiller/vmEnvironmentalInfo/calldatacopy_secFiller.json
@@ -1,36 +1,36 @@
 {
     "calldatacopy_sec": {
-        "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" : {
-			"0xff" : "0x0000000000000000000000000000000000000000000000000000000badc0ffee"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "0x1234567890abcdef01234567890abcdef0",
+            "gas": "100000000000",
+            "gasPrice": "1000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0xff": "0x0000000000000000000000000000000000000000000000000000000badc0ffee"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "nonce" : "0",
-                "code" : "0x6005565b005b6042601f536101036000601f3760005180606014600357640badc0ffee60ff55",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "0x6005565b005b6042601f536101036000601f3760005180606014600357640badc0ffee60ff55",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "0x1234567890abcdef01234567890abcdef0",
-            "gasPrice" : "1000000000",
-            "gas" : "100000000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmEnvironmentalInfo/calldataload0Filler.json b/src/VMTestsFiller/vmEnvironmentalInfo/calldataload0Filler.json
index 0fb54070b..1dc082d11 100644
--- a/src/VMTestsFiller/vmEnvironmentalInfo/calldataload0Filler.json
+++ b/src/VMTestsFiller/vmEnvironmentalInfo/calldataload0Filler.json
@@ -1,36 +1,36 @@
 {
     "calldataload0": {
-        "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" : "0x2560000000000000000000000000000000000000000000000000000000000000"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "0x2560",
+            "gas": "100000000000",
+            "gasPrice": "1000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x2560000000000000000000000000000000000000000000000000000000000000"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (CALLDATALOAD 0)}",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ [[ 0 ]] (CALLDATALOAD 0)}",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "0x2560",
-            "gasPrice" : "1000000000",
-            "gas" : "100000000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmEnvironmentalInfo/calldataload1Filler.json b/src/VMTestsFiller/vmEnvironmentalInfo/calldataload1Filler.json
index e9ac50e24..88c0783cf 100644
--- a/src/VMTestsFiller/vmEnvironmentalInfo/calldataload1Filler.json
+++ b/src/VMTestsFiller/vmEnvironmentalInfo/calldataload1Filler.json
@@ -1,36 +1,36 @@
 {
     "calldataload1": {
-        "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" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff23"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff23",
+            "gas": "100000000000",
+            "gasPrice": "1000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff23"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (CALLDATALOAD 1)}",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ [[ 0 ]] (CALLDATALOAD 1)}",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff23",
-            "gasPrice" : "1000000000",
-            "gas" : "100000000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmEnvironmentalInfo/calldataload2Filler.json b/src/VMTestsFiller/vmEnvironmentalInfo/calldataload2Filler.json
index 08a6bc02f..1d1755acd 100644
--- a/src/VMTestsFiller/vmEnvironmentalInfo/calldataload2Filler.json
+++ b/src/VMTestsFiller/vmEnvironmentalInfo/calldataload2Filler.json
@@ -1,36 +1,36 @@
 {
     "calldataload2": {
-        "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" : "0xbcdef00000000000000000000000000000000000000000000000000024000000"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "0x123456789abcdef00000000000000000000000000000000000000000000000000024",
+            "gas": "100000000000",
+            "gasPrice": "1000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xbcdef00000000000000000000000000000000000000000000000000024000000"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (CALLDATALOAD 5)}",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ [[ 0 ]] (CALLDATALOAD 5)}",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "0x123456789abcdef00000000000000000000000000000000000000000000000000024",
-            "gasPrice" : "1000000000",
-            "gas" : "100000000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmEnvironmentalInfo/calldataloadSizeTooHighFiller.json b/src/VMTestsFiller/vmEnvironmentalInfo/calldataloadSizeTooHighFiller.json
index 0ca31ab1f..471025e9a 100644
--- a/src/VMTestsFiller/vmEnvironmentalInfo/calldataloadSizeTooHighFiller.json
+++ b/src/VMTestsFiller/vmEnvironmentalInfo/calldataloadSizeTooHighFiller.json
@@ -1,35 +1,34 @@
 {
     "calldataloadSizeTooHigh": {
-        "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": "0x123456789abcdef00000000000000000000000000000000000000000000000000024",
+            "gas": "100000000000",
+            "gasPrice": "1000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (CALLDATALOAD 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa)}",
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
                 "storage": {}
             }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "0x123456789abcdef00000000000000000000000000000000000000000000000000024",
-            "gasPrice" : "1000000000",
-            "gas" : "100000000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ [[ 0 ]] (CALLDATALOAD 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa)}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmEnvironmentalInfo/calldataloadSizeTooHighPartialFiller.json b/src/VMTestsFiller/vmEnvironmentalInfo/calldataloadSizeTooHighPartialFiller.json
index cd1087e28..ce6aa163d 100644
--- a/src/VMTestsFiller/vmEnvironmentalInfo/calldataloadSizeTooHighPartialFiller.json
+++ b/src/VMTestsFiller/vmEnvironmentalInfo/calldataloadSizeTooHighPartialFiller.json
@@ -1,36 +1,36 @@
 {
     "calldataloadSizeTooHighPartial": {
-        "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" : "0x0000000000000000000000000000000000000000240000000000000000000000"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "0x123456789abcdef00000000000000000000000000000000000000000000024",
+            "gas": "100000000000",
+            "gasPrice": "1000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x0000000000000000000000000000000000000000240000000000000000000000"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (CALLDATALOAD 10)}",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ [[ 0 ]] (CALLDATALOAD 10)}",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "0x123456789abcdef00000000000000000000000000000000000000000000024",
-            "gasPrice" : "1000000000",
-            "gas" : "100000000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmEnvironmentalInfo/calldataload_BigOffsetFiller.json b/src/VMTestsFiller/vmEnvironmentalInfo/calldataload_BigOffsetFiller.json
index 252df6240..1a6b08a87 100644
--- a/src/VMTestsFiller/vmEnvironmentalInfo/calldataload_BigOffsetFiller.json
+++ b/src/VMTestsFiller/vmEnvironmentalInfo/calldataload_BigOffsetFiller.json
@@ -1,35 +1,34 @@
 {
     "calldataload_BigOffset": {
-        "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": "0x4200000000000000000000000000000000000000000000000000000000000000",
+            "gas": "100000000000",
+            "gasPrice": "1000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (CALLDATALOAD 0x4200000000000000000000000000000000000000000000000000000000000000)}",
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
                 "storage": {}
             }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "0x4200000000000000000000000000000000000000000000000000000000000000",
-            "gasPrice" : "1000000000",
-            "gas" : "100000000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ [[ 0 ]] (CALLDATALOAD 0x4200000000000000000000000000000000000000000000000000000000000000)}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmEnvironmentalInfo/calldatasize0Filler.json b/src/VMTestsFiller/vmEnvironmentalInfo/calldatasize0Filler.json
index 95e9ee78e..3094ae350 100644
--- a/src/VMTestsFiller/vmEnvironmentalInfo/calldatasize0Filler.json
+++ b/src/VMTestsFiller/vmEnvironmentalInfo/calldatasize0Filler.json
@@ -1,36 +1,36 @@
 {
     "calldatasize0": {
-        "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": "0x2560",
+            "gas": "100000000000",
+            "gasPrice": "1000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x02"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (CALLDATASIZE)}",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ [[ 0 ]] (CALLDATASIZE)}",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "0x2560",
-            "gasPrice" : "1000000000",
-            "gas" : "100000000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmEnvironmentalInfo/calldatasize1Filler.json b/src/VMTestsFiller/vmEnvironmentalInfo/calldatasize1Filler.json
index ef546b22c..cefddd0a7 100644
--- a/src/VMTestsFiller/vmEnvironmentalInfo/calldatasize1Filler.json
+++ b/src/VMTestsFiller/vmEnvironmentalInfo/calldatasize1Filler.json
@@ -1,36 +1,36 @@
 {
     "calldatasize1": {
-        "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" : "0x21"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff23",
+            "gas": "100000000000",
+            "gasPrice": "1000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x21"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (CALLDATASIZE)}",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ [[ 0 ]] (CALLDATASIZE)}",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff23",
-            "gasPrice" : "1000000000",
-            "gas" : "100000000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmEnvironmentalInfo/calldatasize2Filler.json b/src/VMTestsFiller/vmEnvironmentalInfo/calldatasize2Filler.json
index a774600ca..7412e97c2 100644
--- a/src/VMTestsFiller/vmEnvironmentalInfo/calldatasize2Filler.json
+++ b/src/VMTestsFiller/vmEnvironmentalInfo/calldatasize2Filler.json
@@ -1,36 +1,36 @@
 {
     "calldatasize2": {
-        "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" : "0x21"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "0x230000000000000000000000000000000000000000000000000000000000000023",
+            "gas": "100000000000",
+            "gasPrice": "1000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x21"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (CALLDATASIZE)}",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ [[ 0 ]] (CALLDATASIZE)}",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "0x230000000000000000000000000000000000000000000000000000000000000023",
-            "gasPrice" : "1000000000",
-            "gas" : "100000000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmEnvironmentalInfo/callerFiller.json b/src/VMTestsFiller/vmEnvironmentalInfo/callerFiller.json
index df12d3c26..26a7d7ab0 100644
--- a/src/VMTestsFiller/vmEnvironmentalInfo/callerFiller.json
+++ b/src/VMTestsFiller/vmEnvironmentalInfo/callerFiller.json
@@ -1,36 +1,36 @@
 {
     "caller": {
-        "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" : "0xcd1722f3947def4cf144679da39c4c32bdc35681"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000000000",
+            "gasPrice": "1000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xcd1722f3947def4cf144679da39c4c32bdc35681"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (CALLER)}",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ [[ 0 ]] (CALLER)}",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "1000000000",
-            "gas" : "100000000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmEnvironmentalInfo/callvalueFiller.json b/src/VMTestsFiller/vmEnvironmentalInfo/callvalueFiller.json
index c0ff9fa25..a3861e7c7 100644
--- a/src/VMTestsFiller/vmEnvironmentalInfo/callvalueFiller.json
+++ b/src/VMTestsFiller/vmEnvironmentalInfo/callvalueFiller.json
@@ -1,36 +1,36 @@
 {
     "callvalue": {
-        "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" : "0x0de0b6b3a7640000"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000000000",
+            "gasPrice": "1000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x0de0b6b3a7640000"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (CALLVALUE)}",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ [[ 0 ]] (CALLVALUE)}",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "1000000000",
-            "gas" : "100000000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmEnvironmentalInfo/codecopy0Filler.json b/src/VMTestsFiller/vmEnvironmentalInfo/codecopy0Filler.json
index 6b865eef7..3b622cb47 100644
--- a/src/VMTestsFiller/vmEnvironmentalInfo/codecopy0Filler.json
+++ b/src/VMTestsFiller/vmEnvironmentalInfo/codecopy0Filler.json
@@ -1,36 +1,36 @@
 {
     "codecopy0": {
-        "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" : "0x6005600060000000000000000000000000000000000000000000000000000000"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "0x1234567890abcdef01234567890abcdef0",
+            "gas": "100000000000",
+            "gasPrice": "1000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x6005600060000000000000000000000000000000000000000000000000000000"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ (CODECOPY 0 0 5 ) [[ 0 ]] @0 }",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ (CODECOPY 0 0 5 ) [[ 0 ]] @0 }",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "0x1234567890abcdef01234567890abcdef0",
-            "gasPrice" : "1000000000",
-            "gas" : "100000000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmEnvironmentalInfo/codecopyZeroMemExpansionFiller.json b/src/VMTestsFiller/vmEnvironmentalInfo/codecopyZeroMemExpansionFiller.json
index 082277437..3f7c9bef5 100644
--- a/src/VMTestsFiller/vmEnvironmentalInfo/codecopyZeroMemExpansionFiller.json
+++ b/src/VMTestsFiller/vmEnvironmentalInfo/codecopyZeroMemExpansionFiller.json
@@ -1,35 +1,34 @@
 {
     "codecopyZeroMemExpansion": {
-        "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": "0x1234567890abcdef01234567890abcdef0",
+            "gas": "100000000000",
+            "gasPrice": "1000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ (CODECOPY 0 0 0 ) [[ 0 ]] @0 }",
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
                 "storage": {}
             }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "0x1234567890abcdef01234567890abcdef0",
-            "gasPrice" : "1000000000",
-            "gas" : "100000000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ (CODECOPY 0 0 0 ) [[ 0 ]] @0 }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmEnvironmentalInfo/codecopy_DataIndexTooHighFiller.json b/src/VMTestsFiller/vmEnvironmentalInfo/codecopy_DataIndexTooHighFiller.json
index dbb66c7e7..25409e956 100644
--- a/src/VMTestsFiller/vmEnvironmentalInfo/codecopy_DataIndexTooHighFiller.json
+++ b/src/VMTestsFiller/vmEnvironmentalInfo/codecopy_DataIndexTooHighFiller.json
@@ -1,35 +1,34 @@
 {
     "codecopy_DataIndexTooHigh": {
-        "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": "0x1234567890abcdef01234567890abcdef0",
+            "gas": "100000000000",
+            "gasPrice": "1000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ (CODECOPY 0 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa 8 ) [[ 0 ]] @0}",
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
                 "storage": {}
             }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "0x1234567890abcdef01234567890abcdef0",
-            "gasPrice" : "1000000000",
-            "gas" : "100000000000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ (CODECOPY 0 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa 8 ) [[ 0 ]] @0}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmEnvironmentalInfo/codesizeFiller.json b/src/VMTestsFiller/vmEnvironmentalInfo/codesizeFiller.json
index c6f2df73e..74a123839 100644
--- a/src/VMTestsFiller/vmEnvironmentalInfo/codesizeFiller.json
+++ b/src/VMTestsFiller/vmEnvironmentalInfo/codesizeFiller.json
@@ -1,36 +1,36 @@
 {
     "codesize": {
-        "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" : "0x04"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "0x1234567890abcdef01234567890abcdef0",
+            "gas": "100000000000",
+            "gasPrice": "1000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x04"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (CODESIZE)}",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ [[ 0 ]] (CODESIZE)}",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "0x1234567890abcdef01234567890abcdef0",
-            "gasPrice" : "1000000000",
-            "gas" : "100000000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmEnvironmentalInfo/gaspriceFiller.json b/src/VMTestsFiller/vmEnvironmentalInfo/gaspriceFiller.json
index 92376e4d2..977d90fc7 100644
--- a/src/VMTestsFiller/vmEnvironmentalInfo/gaspriceFiller.json
+++ b/src/VMTestsFiller/vmEnvironmentalInfo/gaspriceFiller.json
@@ -1,36 +1,36 @@
 {
     "gasprice": {
-        "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" : "0x075bcd15"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "0x1234567890abcdef01234567890abcdef0",
+            "gas": "100000000000",
+            "gasPrice": "123456789",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x075bcd15"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (GASPRICE) }",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ [[ 0 ]] (GASPRICE) }",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "0x1234567890abcdef01234567890abcdef0",
-            "gasPrice" : "123456789",
-            "gas" : "100000000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmEnvironmentalInfo/originFiller.json b/src/VMTestsFiller/vmEnvironmentalInfo/originFiller.json
index 97658657b..e79440fa9 100644
--- a/src/VMTestsFiller/vmEnvironmentalInfo/originFiller.json
+++ b/src/VMTestsFiller/vmEnvironmentalInfo/originFiller.json
@@ -1,36 +1,36 @@
 {
     "origin": {
-        "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" : "0xcd1722f3947def4cf144679da39c4c32bdc35681"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000000000",
+            "gasPrice": "1000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xcd1722f3947def4cf144679da39c4c32bdc35681"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (ORIGIN)}",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ [[ 0 ]] (ORIGIN)}",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "1000000000",
-            "gas" : "100000000000"
         }
     }
-}
+}
\ No newline at end of file
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
diff --git a/src/VMTestsFiller/vmLogTest/log0_emptyMemFiller.json b/src/VMTestsFiller/vmLogTest/log0_emptyMemFiller.json
index 7b02e3536..0721a4ca9 100644
--- a/src/VMTestsFiller/vmLogTest/log0_emptyMemFiller.json
+++ b/src/VMTestsFiller/vmLogTest/log0_emptyMemFiller.json
@@ -1,29 +1,29 @@
 {
     "log0_emptyMem": {
-        "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" : "{ (LOG0 0 0) }",
-            "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": "{ (LOG0 0 0) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log0_logMemStartTooHighFiller.json b/src/VMTestsFiller/vmLogTest/log0_logMemStartTooHighFiller.json
index 99a53fc49..3d87da96a 100644
--- a/src/VMTestsFiller/vmLogTest/log0_logMemStartTooHighFiller.json
+++ b/src/VMTestsFiller/vmLogTest/log0_logMemStartTooHighFiller.json
@@ -1,29 +1,29 @@
 {
     "log0_logMemStartTooHigh": {
-        "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" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 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": "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 1) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log0_logMemsizeTooHighFiller.json b/src/VMTestsFiller/vmLogTest/log0_logMemsizeTooHighFiller.json
index 6985c3794..de1bb21dd 100644
--- a/src/VMTestsFiller/vmLogTest/log0_logMemsizeTooHighFiller.json
+++ b/src/VMTestsFiller/vmLogTest/log0_logMemsizeTooHighFiller.json
@@ -1,29 +1,29 @@
 {
     "log0_logMemsizeTooHigh": {
-        "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" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG0 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }",
-            "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": "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG0 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log0_logMemsizeZeroFiller.json b/src/VMTestsFiller/vmLogTest/log0_logMemsizeZeroFiller.json
index b35f71a20..9b4cfde91 100644
--- a/src/VMTestsFiller/vmLogTest/log0_logMemsizeZeroFiller.json
+++ b/src/VMTestsFiller/vmLogTest/log0_logMemsizeZeroFiller.json
@@ -1,29 +1,29 @@
 {
     "log0_logMemsizeZero": {
-        "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" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG0 1 0) }",
-            "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": "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG0 1 0) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log0_nonEmptyMemFiller.json b/src/VMTestsFiller/vmLogTest/log0_nonEmptyMemFiller.json
index cc1d4865a..8ddd41548 100644
--- a/src/VMTestsFiller/vmLogTest/log0_nonEmptyMemFiller.json
+++ b/src/VMTestsFiller/vmLogTest/log0_nonEmptyMemFiller.json
@@ -1,29 +1,29 @@
 {
     "log0_nonEmptyMem": {
-        "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" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG0 0 32) }",
-            "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": "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG0 0 32) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log0_nonEmptyMem_logMemSize1Filler.json b/src/VMTestsFiller/vmLogTest/log0_nonEmptyMem_logMemSize1Filler.json
index b21fce207..66fcdafdc 100644
--- a/src/VMTestsFiller/vmLogTest/log0_nonEmptyMem_logMemSize1Filler.json
+++ b/src/VMTestsFiller/vmLogTest/log0_nonEmptyMem_logMemSize1Filler.json
@@ -1,29 +1,29 @@
 {
     "log0_nonEmptyMem_logMemSize1": {
-        "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" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG0 0 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": "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG0 0 1) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log0_nonEmptyMem_logMemSize1_logMemStart31Filler.json b/src/VMTestsFiller/vmLogTest/log0_nonEmptyMem_logMemSize1_logMemStart31Filler.json
index 64ef1768c..68ea1b1fd 100644
--- a/src/VMTestsFiller/vmLogTest/log0_nonEmptyMem_logMemSize1_logMemStart31Filler.json
+++ b/src/VMTestsFiller/vmLogTest/log0_nonEmptyMem_logMemSize1_logMemStart31Filler.json
@@ -1,29 +1,29 @@
 {
     "log0_nonEmptyMem_logMemSize1_logMemStart31": {
-        "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" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG0 31 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": "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG0 31 1) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log1_CallerFiller.json b/src/VMTestsFiller/vmLogTest/log1_CallerFiller.json
index 96d1b9bf4..fe9133ed9 100644
--- a/src/VMTestsFiller/vmLogTest/log1_CallerFiller.json
+++ b/src/VMTestsFiller/vmLogTest/log1_CallerFiller.json
@@ -1,29 +1,29 @@
 {
     "log1_Caller": {
-        "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" : "{ (MSTORE8 0 0xff) (LOG1 0 32 (CALLER)) }",
-            "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": "{ (MSTORE8 0 0xff) (LOG1 0 32 (CALLER)) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log1_MaxTopicFiller.json b/src/VMTestsFiller/vmLogTest/log1_MaxTopicFiller.json
index b68730585..791c8ea0a 100644
--- a/src/VMTestsFiller/vmLogTest/log1_MaxTopicFiller.json
+++ b/src/VMTestsFiller/vmLogTest/log1_MaxTopicFiller.json
@@ -1,29 +1,29 @@
 {
     "log1_MaxTopic": {
-        "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" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG1 0 32 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }",
-            "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": "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG1 0 32 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log1_emptyMemFiller.json b/src/VMTestsFiller/vmLogTest/log1_emptyMemFiller.json
index 69820a53f..609f8a0c0 100644
--- a/src/VMTestsFiller/vmLogTest/log1_emptyMemFiller.json
+++ b/src/VMTestsFiller/vmLogTest/log1_emptyMemFiller.json
@@ -1,29 +1,29 @@
 {
     "log1_emptyMem": {
-        "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" : "{ (LOG1 0 0 0) }",
-            "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": "{ (LOG1 0 0 0) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log1_logMemStartTooHighFiller.json b/src/VMTestsFiller/vmLogTest/log1_logMemStartTooHighFiller.json
index cf05ac4a1..46bdd2748 100644
--- a/src/VMTestsFiller/vmLogTest/log1_logMemStartTooHighFiller.json
+++ b/src/VMTestsFiller/vmLogTest/log1_logMemStartTooHighFiller.json
@@ -1,29 +1,29 @@
 {
     "log1_logMemStartTooHigh": {
-        "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" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 1 0) }",
-            "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": "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 1 0) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log1_logMemsizeTooHighFiller.json b/src/VMTestsFiller/vmLogTest/log1_logMemsizeTooHighFiller.json
index eadcf8b61..1cfbce0f4 100644
--- a/src/VMTestsFiller/vmLogTest/log1_logMemsizeTooHighFiller.json
+++ b/src/VMTestsFiller/vmLogTest/log1_logMemsizeTooHighFiller.json
@@ -1,29 +1,29 @@
 {
     "log1_logMemsizeTooHigh": {
-        "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" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG1 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0) }",
-            "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": "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG1 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log1_logMemsizeZeroFiller.json b/src/VMTestsFiller/vmLogTest/log1_logMemsizeZeroFiller.json
index 670d54f5d..d9c9acc71 100644
--- a/src/VMTestsFiller/vmLogTest/log1_logMemsizeZeroFiller.json
+++ b/src/VMTestsFiller/vmLogTest/log1_logMemsizeZeroFiller.json
@@ -1,29 +1,29 @@
 {
     "log1_logMemsizeZero": {
-        "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" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG1 1 0 0) }",
-            "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": "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG1 1 0 0) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log1_nonEmptyMemFiller.json b/src/VMTestsFiller/vmLogTest/log1_nonEmptyMemFiller.json
index fe1aadf76..8aef7cbe9 100644
--- a/src/VMTestsFiller/vmLogTest/log1_nonEmptyMemFiller.json
+++ b/src/VMTestsFiller/vmLogTest/log1_nonEmptyMemFiller.json
@@ -1,29 +1,29 @@
 {
     "log1_nonEmptyMem": {
-        "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" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG1 0 32 0) }",
-            "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": "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG1 0 32 0) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log1_nonEmptyMem_logMemSize1Filler.json b/src/VMTestsFiller/vmLogTest/log1_nonEmptyMem_logMemSize1Filler.json
index d13eab431..f04626e55 100644
--- a/src/VMTestsFiller/vmLogTest/log1_nonEmptyMem_logMemSize1Filler.json
+++ b/src/VMTestsFiller/vmLogTest/log1_nonEmptyMem_logMemSize1Filler.json
@@ -1,29 +1,29 @@
 {
     "log1_nonEmptyMem_logMemSize1": {
-        "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" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG1 0 1 0) }",
-            "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": "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG1 0 1 0) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log1_nonEmptyMem_logMemSize1_logMemStart31Filler.json b/src/VMTestsFiller/vmLogTest/log1_nonEmptyMem_logMemSize1_logMemStart31Filler.json
index 6ea57dd77..ed7e2cd24 100644
--- a/src/VMTestsFiller/vmLogTest/log1_nonEmptyMem_logMemSize1_logMemStart31Filler.json
+++ b/src/VMTestsFiller/vmLogTest/log1_nonEmptyMem_logMemSize1_logMemStart31Filler.json
@@ -1,29 +1,29 @@
 {
     "log1_nonEmptyMem_logMemSize1_logMemStart31": {
-        "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" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG1 31 1 0) }",
-            "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": "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG1 31 1 0) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log2_CallerFiller.json b/src/VMTestsFiller/vmLogTest/log2_CallerFiller.json
index a42fc888e..5b05f31cb 100644
--- a/src/VMTestsFiller/vmLogTest/log2_CallerFiller.json
+++ b/src/VMTestsFiller/vmLogTest/log2_CallerFiller.json
@@ -1,29 +1,29 @@
 {
     "log2_Caller": {
-        "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" : "{ (MSTORE8 0 0xff) (LOG2 0 32 0 (CALLER) ) }",
-            "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": "{ (MSTORE8 0 0xff) (LOG2 0 32 0 (CALLER) ) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log2_MaxTopicFiller.json b/src/VMTestsFiller/vmLogTest/log2_MaxTopicFiller.json
index e55129aed..e77540f1a 100644
--- a/src/VMTestsFiller/vmLogTest/log2_MaxTopicFiller.json
+++ b/src/VMTestsFiller/vmLogTest/log2_MaxTopicFiller.json
@@ -1,29 +1,29 @@
 {
     "log2_MaxTopic": {
-        "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" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG2 0 32 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }",
-            "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": "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG2 0 32 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log2_emptyMemFiller.json b/src/VMTestsFiller/vmLogTest/log2_emptyMemFiller.json
index c006c3950..43109489d 100644
--- a/src/VMTestsFiller/vmLogTest/log2_emptyMemFiller.json
+++ b/src/VMTestsFiller/vmLogTest/log2_emptyMemFiller.json
@@ -1,29 +1,29 @@
 {
     "log2_emptyMem": {
-        "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" : "{ (LOG2 0 0 0 0) }",
-            "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": "{ (LOG2 0 0 0 0) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log2_logMemStartTooHighFiller.json b/src/VMTestsFiller/vmLogTest/log2_logMemStartTooHighFiller.json
index 3aa2a2bc9..af58beb82 100644
--- a/src/VMTestsFiller/vmLogTest/log2_logMemStartTooHighFiller.json
+++ b/src/VMTestsFiller/vmLogTest/log2_logMemStartTooHighFiller.json
@@ -1,29 +1,29 @@
 {
     "log2_logMemStartTooHigh": {
-        "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" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG2 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 1 0 0) }",
-            "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": "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG2 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 1 0 0) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log2_logMemsizeTooHighFiller.json b/src/VMTestsFiller/vmLogTest/log2_logMemsizeTooHighFiller.json
index 74efe1b0b..00460b87a 100644
--- a/src/VMTestsFiller/vmLogTest/log2_logMemsizeTooHighFiller.json
+++ b/src/VMTestsFiller/vmLogTest/log2_logMemsizeTooHighFiller.json
@@ -1,29 +1,29 @@
 {
     "log2_logMemsizeTooHigh": {
-        "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" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG2 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 0) }",
-            "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": "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG2 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 0) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log2_logMemsizeZeroFiller.json b/src/VMTestsFiller/vmLogTest/log2_logMemsizeZeroFiller.json
index 019ea633f..eb95b0451 100644
--- a/src/VMTestsFiller/vmLogTest/log2_logMemsizeZeroFiller.json
+++ b/src/VMTestsFiller/vmLogTest/log2_logMemsizeZeroFiller.json
@@ -1,29 +1,29 @@
 {
     "log2_logMemsizeZero": {
-        "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" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG2 1 0 0 0) }",
-            "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": "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG2 1 0 0 0) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log2_nonEmptyMemFiller.json b/src/VMTestsFiller/vmLogTest/log2_nonEmptyMemFiller.json
index eb564651b..b6c6f31de 100644
--- a/src/VMTestsFiller/vmLogTest/log2_nonEmptyMemFiller.json
+++ b/src/VMTestsFiller/vmLogTest/log2_nonEmptyMemFiller.json
@@ -1,29 +1,29 @@
 {
     "log2_nonEmptyMem": {
-        "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" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG2 0 32 0 0) }",
-            "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": "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG2 0 32 0 0) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log2_nonEmptyMem_logMemSize1Filler.json b/src/VMTestsFiller/vmLogTest/log2_nonEmptyMem_logMemSize1Filler.json
index 82e0d060c..c476a1953 100644
--- a/src/VMTestsFiller/vmLogTest/log2_nonEmptyMem_logMemSize1Filler.json
+++ b/src/VMTestsFiller/vmLogTest/log2_nonEmptyMem_logMemSize1Filler.json
@@ -1,29 +1,29 @@
 {
-   "log2_nonEmptyMem_logMemSize1": {
-        "env" : {
-        "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-        "currentNumber" : "0",
-        "currentGasLimit" : "1000000",
-        "currentDifficulty" : "256",
-        "currentTimestamp" : "1",
-        "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+    "log2_nonEmptyMem_logMemSize1": {
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-        "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-            "balance" : "100000000000000000000000",
-            "nonce" : "0",
-            "code" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG2 0 1 0 0) }",
-            "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": "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG2 0 1 0 0) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log2_nonEmptyMem_logMemSize1_logMemStart31Filler.json b/src/VMTestsFiller/vmLogTest/log2_nonEmptyMem_logMemSize1_logMemStart31Filler.json
index c0b1b9cc6..b009ed476 100644
--- a/src/VMTestsFiller/vmLogTest/log2_nonEmptyMem_logMemSize1_logMemStart31Filler.json
+++ b/src/VMTestsFiller/vmLogTest/log2_nonEmptyMem_logMemSize1_logMemStart31Filler.json
@@ -1,29 +1,29 @@
 {
     "log2_nonEmptyMem_logMemSize1_logMemStart31": {
-        "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" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG2 31 1 0 0) }",
-            "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": "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG2 31 1 0 0) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log3_CallerFiller.json b/src/VMTestsFiller/vmLogTest/log3_CallerFiller.json
index 9f42474cc..a28025531 100644
--- a/src/VMTestsFiller/vmLogTest/log3_CallerFiller.json
+++ b/src/VMTestsFiller/vmLogTest/log3_CallerFiller.json
@@ -1,29 +1,29 @@
 {
     "log3_Caller": {
-        "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" : "{ (MSTORE8 0 0xff) (LOG3 0 32 0 0 (CALLER) ) }",
-            "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": "{ (MSTORE8 0 0xff) (LOG3 0 32 0 0 (CALLER) ) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log3_MaxTopicFiller.json b/src/VMTestsFiller/vmLogTest/log3_MaxTopicFiller.json
index 202fa1b01..591259eb7 100644
--- a/src/VMTestsFiller/vmLogTest/log3_MaxTopicFiller.json
+++ b/src/VMTestsFiller/vmLogTest/log3_MaxTopicFiller.json
@@ -1,29 +1,29 @@
 {
     "log3_MaxTopic": {
-        "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" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG3 0 32 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }",
-            "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": "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG3 0 32 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log3_PCFiller.json b/src/VMTestsFiller/vmLogTest/log3_PCFiller.json
index 5c8e9487a..972cb4bac 100644
--- a/src/VMTestsFiller/vmLogTest/log3_PCFiller.json
+++ b/src/VMTestsFiller/vmLogTest/log3_PCFiller.json
@@ -1,29 +1,29 @@
 {
     "log3_PC": {
-        "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" : "{ (MSTORE8 0 0xff) (LOG3 0 32 (PC) (PC) (PC) ) }",
-            "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": "{ (MSTORE8 0 0xff) (LOG3 0 32 (PC) (PC) (PC) ) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log3_emptyMemFiller.json b/src/VMTestsFiller/vmLogTest/log3_emptyMemFiller.json
index 62c5d6baa..0e09e3822 100644
--- a/src/VMTestsFiller/vmLogTest/log3_emptyMemFiller.json
+++ b/src/VMTestsFiller/vmLogTest/log3_emptyMemFiller.json
@@ -1,29 +1,29 @@
 {
     "log3_emptyMem": {
-        "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" : "{ (LOG3 0 0 0 0 0) }",
-            "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": "{ (LOG3 0 0 0 0 0) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log3_logMemStartTooHighFiller.json b/src/VMTestsFiller/vmLogTest/log3_logMemStartTooHighFiller.json
index 3d789c84a..f4c336930 100644
--- a/src/VMTestsFiller/vmLogTest/log3_logMemStartTooHighFiller.json
+++ b/src/VMTestsFiller/vmLogTest/log3_logMemStartTooHighFiller.json
@@ -1,29 +1,29 @@
 {
     "log3_logMemStartTooHigh": {
-        "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" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG3 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 1 0 0 0) }",
-            "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": "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG3 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 1 0 0 0) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log3_logMemsizeTooHighFiller.json b/src/VMTestsFiller/vmLogTest/log3_logMemsizeTooHighFiller.json
index 158e015ac..5375dbde6 100644
--- a/src/VMTestsFiller/vmLogTest/log3_logMemsizeTooHighFiller.json
+++ b/src/VMTestsFiller/vmLogTest/log3_logMemsizeTooHighFiller.json
@@ -1,29 +1,29 @@
 {
     "log3_logMemsizeTooHigh": {
-        "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" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG3 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 0 0) }",
-            "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": "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG3 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 0 0) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log3_logMemsizeZeroFiller.json b/src/VMTestsFiller/vmLogTest/log3_logMemsizeZeroFiller.json
index c4670e38d..e1719d2af 100644
--- a/src/VMTestsFiller/vmLogTest/log3_logMemsizeZeroFiller.json
+++ b/src/VMTestsFiller/vmLogTest/log3_logMemsizeZeroFiller.json
@@ -1,29 +1,29 @@
 {
     "log3_logMemsizeZero": {
-        "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" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG3 1 0 0 0 0) }",
-            "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": "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG3 1 0 0 0 0) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log3_nonEmptyMemFiller.json b/src/VMTestsFiller/vmLogTest/log3_nonEmptyMemFiller.json
index 9f26bae48..714e7dfee 100644
--- a/src/VMTestsFiller/vmLogTest/log3_nonEmptyMemFiller.json
+++ b/src/VMTestsFiller/vmLogTest/log3_nonEmptyMemFiller.json
@@ -1,29 +1,29 @@
 {
     "log3_nonEmptyMem": {
-        "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" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG3 0 32 0 0 0) }",
-            "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": "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG3 0 32 0 0 0) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log3_nonEmptyMem_logMemSize1Filler.json b/src/VMTestsFiller/vmLogTest/log3_nonEmptyMem_logMemSize1Filler.json
index 6fd5c186b..4328fc1e4 100644
--- a/src/VMTestsFiller/vmLogTest/log3_nonEmptyMem_logMemSize1Filler.json
+++ b/src/VMTestsFiller/vmLogTest/log3_nonEmptyMem_logMemSize1Filler.json
@@ -1,29 +1,29 @@
 {
     "log3_nonEmptyMem_logMemSize1": {
-        "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" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG3 0 1 0 0 0) }",
-            "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": "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG3 0 1 0 0 0) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log3_nonEmptyMem_logMemSize1_logMemStart31Filler.json b/src/VMTestsFiller/vmLogTest/log3_nonEmptyMem_logMemSize1_logMemStart31Filler.json
index 4b582d28a..23219b57f 100644
--- a/src/VMTestsFiller/vmLogTest/log3_nonEmptyMem_logMemSize1_logMemStart31Filler.json
+++ b/src/VMTestsFiller/vmLogTest/log3_nonEmptyMem_logMemSize1_logMemStart31Filler.json
@@ -1,29 +1,29 @@
 {
     "log3_nonEmptyMem_logMemSize1_logMemStart31": {
-        "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" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG3 31 1 0 0 0) }",
-            "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": "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG3 31 1 0 0 0) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log4_CallerFiller.json b/src/VMTestsFiller/vmLogTest/log4_CallerFiller.json
index 93dba9f7c..9a4aef9ec 100644
--- a/src/VMTestsFiller/vmLogTest/log4_CallerFiller.json
+++ b/src/VMTestsFiller/vmLogTest/log4_CallerFiller.json
@@ -1,29 +1,29 @@
 {
     "log4_Caller": {
-        "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" : "{ (MSTORE8 0 0xff) (LOG4 0 32 0 0 0 (CALLER) ) }",
-            "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": "{ (MSTORE8 0 0xff) (LOG4 0 32 0 0 0 (CALLER) ) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log4_MaxTopicFiller.json b/src/VMTestsFiller/vmLogTest/log4_MaxTopicFiller.json
index debdd9fb1..690c2eaa8 100644
--- a/src/VMTestsFiller/vmLogTest/log4_MaxTopicFiller.json
+++ b/src/VMTestsFiller/vmLogTest/log4_MaxTopicFiller.json
@@ -1,29 +1,29 @@
 {
     "log4_MaxTopic": {
-        "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" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG4 0 32 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }",
-            "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": "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG4 0 32 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log4_PCFiller.json b/src/VMTestsFiller/vmLogTest/log4_PCFiller.json
index 0fca59b5e..7a2d84cb6 100644
--- a/src/VMTestsFiller/vmLogTest/log4_PCFiller.json
+++ b/src/VMTestsFiller/vmLogTest/log4_PCFiller.json
@@ -1,29 +1,29 @@
 {
     "log4_PC": {
-        "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" : "{ (MSTORE8 0 0xff) (LOG4 0 32 (PC) (PC) (PC) (PC) ) }",
-            "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": "{ (MSTORE8 0 0xff) (LOG4 0 32 (PC) (PC) (PC) (PC) ) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log4_emptyMemFiller.json b/src/VMTestsFiller/vmLogTest/log4_emptyMemFiller.json
index 218ee2e56..286572d6e 100644
--- a/src/VMTestsFiller/vmLogTest/log4_emptyMemFiller.json
+++ b/src/VMTestsFiller/vmLogTest/log4_emptyMemFiller.json
@@ -1,29 +1,29 @@
 {
     "log4_emptyMem": {
-        "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" : "{ (LOG4 0 0 0 0 0 0) }",
-            "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": "{ (LOG4 0 0 0 0 0 0) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log4_logMemStartTooHighFiller.json b/src/VMTestsFiller/vmLogTest/log4_logMemStartTooHighFiller.json
index c3bd0b7e7..c3b271b0e 100644
--- a/src/VMTestsFiller/vmLogTest/log4_logMemStartTooHighFiller.json
+++ b/src/VMTestsFiller/vmLogTest/log4_logMemStartTooHighFiller.json
@@ -1,29 +1,29 @@
 {
     "log4_logMemStartTooHigh": {
-        "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" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG4 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 1 0 0 0 0) }",
-            "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": "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG4 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 1 0 0 0 0) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log4_logMemsizeTooHighFiller.json b/src/VMTestsFiller/vmLogTest/log4_logMemsizeTooHighFiller.json
index 80fff5dfd..ec8420ee9 100644
--- a/src/VMTestsFiller/vmLogTest/log4_logMemsizeTooHighFiller.json
+++ b/src/VMTestsFiller/vmLogTest/log4_logMemsizeTooHighFiller.json
@@ -1,29 +1,29 @@
 {
     "log4_logMemsizeTooHigh": {
-        "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" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG4 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 0 0 0) }",
-            "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": "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG4 1 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 0 0 0) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log4_logMemsizeZeroFiller.json b/src/VMTestsFiller/vmLogTest/log4_logMemsizeZeroFiller.json
index 80a9c91fb..8b645d2ff 100644
--- a/src/VMTestsFiller/vmLogTest/log4_logMemsizeZeroFiller.json
+++ b/src/VMTestsFiller/vmLogTest/log4_logMemsizeZeroFiller.json
@@ -1,29 +1,29 @@
 {
     "log4_logMemsizeZero": {
-        "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" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG4 1 0 0 0 0 0) }",
-            "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": "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG4 1 0 0 0 0 0) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log4_nonEmptyMemFiller.json b/src/VMTestsFiller/vmLogTest/log4_nonEmptyMemFiller.json
index 7b60d39ea..cdc6e5c12 100644
--- a/src/VMTestsFiller/vmLogTest/log4_nonEmptyMemFiller.json
+++ b/src/VMTestsFiller/vmLogTest/log4_nonEmptyMemFiller.json
@@ -1,29 +1,29 @@
 {
     "log4_nonEmptyMem": {
-        "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" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG4 0 32 0 0 0 0) }",
-            "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": "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG4 0 32 0 0 0 0) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log4_nonEmptyMem_logMemSize1Filler.json b/src/VMTestsFiller/vmLogTest/log4_nonEmptyMem_logMemSize1Filler.json
index e4aee0d58..f1043bb7f 100644
--- a/src/VMTestsFiller/vmLogTest/log4_nonEmptyMem_logMemSize1Filler.json
+++ b/src/VMTestsFiller/vmLogTest/log4_nonEmptyMem_logMemSize1Filler.json
@@ -1,29 +1,29 @@
 {
     "log4_nonEmptyMem_logMemSize1": {
-        "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" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG4 0 1 0 0 0 0) }",
-            "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": "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG4 0 1 0 0 0 0) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log4_nonEmptyMem_logMemSize1_logMemStart31Filler.json b/src/VMTestsFiller/vmLogTest/log4_nonEmptyMem_logMemSize1_logMemStart31Filler.json
index adaa036f3..6742ec5cd 100644
--- a/src/VMTestsFiller/vmLogTest/log4_nonEmptyMem_logMemSize1_logMemStart31Filler.json
+++ b/src/VMTestsFiller/vmLogTest/log4_nonEmptyMem_logMemSize1_logMemStart31Filler.json
@@ -1,29 +1,29 @@
 {
     "log4_nonEmptyMem_logMemSize1_logMemStart31": {
-        "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" : "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG4 31 1 0 0 0 0) }",
-            "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": "{ (MSTORE 0 0xaabbffffffffffffffffffffffffffffffffffffffffffffffffffffffffccdd) (LOG4 31 1 0 0 0 0) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmLogTest/log_2logsFiller.json b/src/VMTestsFiller/vmLogTest/log_2logsFiller.json
index b72afa1b0..22563cf71 100644
--- a/src/VMTestsFiller/vmLogTest/log_2logsFiller.json
+++ b/src/VMTestsFiller/vmLogTest/log_2logsFiller.json
@@ -1,29 +1,29 @@
 {
     "log_2logs": {
-        "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" : "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG0 0 32) (LOG0 2 16) }",
-            "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": "{ (MSTORE 0 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) (LOG0 0 32) (LOG0 2 16) }",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmPerformance/ackermann31Filler.json b/src/VMTestsFiller/vmPerformance/ackermann31Filler.json
index d0c8d3832..8ee211a2d 100644
--- a/src/VMTestsFiller/vmPerformance/ackermann31Filler.json
+++ b/src/VMTestsFiller/vmPerformance/ackermann31Filler.json
@@ -1,31 +1,31 @@
 {
     "ackermann31": {
-        "env" : {
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-            "currentNumber" : "0",
-            "currentGasLimit" : "100000000000",
-            "currentDifficulty" : "256",
-            "currentTimestamp" : "1",
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "100000000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "//" : "PerformanceTester.sol",
-                "code" : "0x60e060020a6000350480632839e92814601e57806361047ff414603457005b602a6004356024356047565b8060005260206000f35b603d6004356099565b8060005260206000f35b600082600014605457605e565b8160010190506093565b81600014606957607b565b60756001840360016047565b90506093565b609060018403608c85600186036047565b6047565b90505b92915050565b6000816000148060a95750816001145b60b05760b7565b81905060cf565b60c1600283036099565b60cb600184036099565b0190505b91905056",
+        "exec": {
+            "//": "ackermann(3, 1)",
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "0x2839e92800000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000001",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "//": "PerformanceTester.sol",
+                "balance": "100000000000000000000000",
+                "code": "0x60e060020a6000350480632839e92814601e57806361047ff414603457005b602a6004356024356047565b8060005260206000f35b603d6004356099565b8060005260206000f35b600082600014605457605e565b8160010190506093565b81600014606957607b565b60756001840360016047565b90506093565b609060018403608c85600186036047565b6047565b90505b92915050565b6000816000148060a95750816001145b60b05760b7565b81905060cf565b60c1600283036099565b60cb600184036099565b0190505b91905056",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "//"   : "ackermann(3, 1)",
-            "data" : "0x2839e92800000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000001",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmPerformance/ackermann32Filler.json b/src/VMTestsFiller/vmPerformance/ackermann32Filler.json
index 8da1dbe53..44ab8580a 100644
--- a/src/VMTestsFiller/vmPerformance/ackermann32Filler.json
+++ b/src/VMTestsFiller/vmPerformance/ackermann32Filler.json
@@ -1,31 +1,31 @@
 {
     "ackermann32": {
-        "env" : {
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-            "currentNumber" : "0",
-            "currentGasLimit" : "100000000000",
-            "currentDifficulty" : "256",
-            "currentTimestamp" : "1",
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "100000000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "//" : "PerformanceTester.sol",
-                "code" : "0x60e060020a6000350480632839e92814601e57806361047ff414603457005b602a6004356024356047565b8060005260206000f35b603d6004356099565b8060005260206000f35b600082600014605457605e565b8160010190506093565b81600014606957607b565b60756001840360016047565b90506093565b609060018403608c85600186036047565b6047565b90505b92915050565b6000816000148060a95750816001145b60b05760b7565b81905060cf565b60c1600283036099565b60cb600184036099565b0190505b91905056",
+        "exec": {
+            "//": "ackermann(3, 2)",
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "0x2839e92800000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000002",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "//": "PerformanceTester.sol",
+                "balance": "100000000000000000000000",
+                "code": "0x60e060020a6000350480632839e92814601e57806361047ff414603457005b602a6004356024356047565b8060005260206000f35b603d6004356099565b8060005260206000f35b600082600014605457605e565b8160010190506093565b81600014606957607b565b60756001840360016047565b90506093565b609060018403608c85600186036047565b6047565b90505b92915050565b6000816000148060a95750816001145b60b05760b7565b81905060cf565b60c1600283036099565b60cb600184036099565b0190505b91905056",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "//"   : "ackermann(3, 2)",
-            "data" : "0x2839e92800000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000002",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmPerformance/ackermann33Filler.json b/src/VMTestsFiller/vmPerformance/ackermann33Filler.json
index fe2f4185c..3b1d847da 100644
--- a/src/VMTestsFiller/vmPerformance/ackermann33Filler.json
+++ b/src/VMTestsFiller/vmPerformance/ackermann33Filler.json
@@ -1,31 +1,31 @@
 {
     "ackermann33": {
-        "env" : {
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-            "currentNumber" : "0",
-            "currentGasLimit" : "100000000000",
-            "currentDifficulty" : "256",
-            "currentTimestamp" : "1",
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "100000000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "//" : "PerformanceTester.sol",
-                "code" : "0x60e060020a6000350480632839e92814601e57806361047ff414603457005b602a6004356024356047565b8060005260206000f35b603d6004356099565b8060005260206000f35b600082600014605457605e565b8160010190506093565b81600014606957607b565b60756001840360016047565b90506093565b609060018403608c85600186036047565b6047565b90505b92915050565b6000816000148060a95750816001145b60b05760b7565b81905060cf565b60c1600283036099565b60cb600184036099565b0190505b91905056",
+        "exec": {
+            "//": "ackermann(3, 3)",
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "0x2839e92800000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "//": "PerformanceTester.sol",
+                "balance": "100000000000000000000000",
+                "code": "0x60e060020a6000350480632839e92814601e57806361047ff414603457005b602a6004356024356047565b8060005260206000f35b603d6004356099565b8060005260206000f35b600082600014605457605e565b8160010190506093565b81600014606957607b565b60756001840360016047565b90506093565b609060018403608c85600186036047565b6047565b90505b92915050565b6000816000148060a95750816001145b60b05760b7565b81905060cf565b60c1600283036099565b60cb600184036099565b0190505b91905056",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "//"   : "ackermann(3, 3)",
-            "data" : "0x2839e92800000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000003",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmPerformance/fibonacci10Filler.json b/src/VMTestsFiller/vmPerformance/fibonacci10Filler.json
index 5eb575575..4bb45a82e 100644
--- a/src/VMTestsFiller/vmPerformance/fibonacci10Filler.json
+++ b/src/VMTestsFiller/vmPerformance/fibonacci10Filler.json
@@ -1,31 +1,31 @@
 {
     "fibonacci10": {
-        "env" : {
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-            "currentNumber" : "0",
-            "currentGasLimit" : "100000000000",
-            "currentDifficulty" : "256",
-            "currentTimestamp" : "1",
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "100000000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "//"   : "PerformanceTester.sol",
-                "code" : "0x60e060020a6000350480632839e92814601e57806361047ff414603457005b602a6004356024356047565b8060005260206000f35b603d6004356099565b8060005260206000f35b600082600014605457605e565b8160010190506093565b81600014606957607b565b60756001840360016047565b90506093565b609060018403608c85600186036047565b6047565b90505b92915050565b6000816000148060a95750816001145b60b05760b7565b81905060cf565b60c1600283036099565b60cb600184036099565b0190505b91905056",
+        "exec": {
+            "//": "fibonacci(10)",
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "0x61047ff4000000000000000000000000000000000000000000000000000000000000000a",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "//": "PerformanceTester.sol",
+                "balance": "100000000000000000000000",
+                "code": "0x60e060020a6000350480632839e92814601e57806361047ff414603457005b602a6004356024356047565b8060005260206000f35b603d6004356099565b8060005260206000f35b600082600014605457605e565b8160010190506093565b81600014606957607b565b60756001840360016047565b90506093565b609060018403608c85600186036047565b6047565b90505b92915050565b6000816000148060a95750816001145b60b05760b7565b81905060cf565b60c1600283036099565b60cb600184036099565b0190505b91905056",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "//"   : "fibonacci(10)",
-            "data" : "0x61047ff4000000000000000000000000000000000000000000000000000000000000000a",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmPerformance/fibonacci16Filler.json b/src/VMTestsFiller/vmPerformance/fibonacci16Filler.json
index 8e271e6ef..c27464a75 100644
--- a/src/VMTestsFiller/vmPerformance/fibonacci16Filler.json
+++ b/src/VMTestsFiller/vmPerformance/fibonacci16Filler.json
@@ -1,31 +1,31 @@
 {
     "fibonacci16": {
-        "env" : {
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-            "currentNumber" : "0",
-            "currentGasLimit" : "100000000000",
-            "currentDifficulty" : "256",
-            "currentTimestamp" : "1",
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "100000000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "//"   : "PerformanceTester.sol",
-                "code" : "0x60e060020a6000350480632839e92814601e57806361047ff414603457005b602a6004356024356047565b8060005260206000f35b603d6004356099565b8060005260206000f35b600082600014605457605e565b8160010190506093565b81600014606957607b565b60756001840360016047565b90506093565b609060018403608c85600186036047565b6047565b90505b92915050565b6000816000148060a95750816001145b60b05760b7565b81905060cf565b60c1600283036099565b60cb600184036099565b0190505b91905056",
+        "exec": {
+            "//": "fibonacci(16)",
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "0x61047ff40000000000000000000000000000000000000000000000000000000000000010",
+            "gas": "100000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "//": "PerformanceTester.sol",
+                "balance": "100000000000000000000000",
+                "code": "0x60e060020a6000350480632839e92814601e57806361047ff414603457005b602a6004356024356047565b8060005260206000f35b603d6004356099565b8060005260206000f35b600082600014605457605e565b8160010190506093565b81600014606957607b565b60756001840360016047565b90506093565b609060018403608c85600186036047565b6047565b90505b92915050565b6000816000148060a95750816001145b60b05760b7565b81905060cf565b60c1600283036099565b60cb600184036099565b0190505b91905056",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "//"   : "fibonacci(16)",
-            "data" : "0x61047ff40000000000000000000000000000000000000000000000000000000000000010",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmPerformance/loop-add-10MFiller.json b/src/VMTestsFiller/vmPerformance/loop-add-10MFiller.json
index e9a5036b2..39e1a899f 100644
--- a/src/VMTestsFiller/vmPerformance/loop-add-10MFiller.json
+++ b/src/VMTestsFiller/vmPerformance/loop-add-10MFiller.json
@@ -1,31 +1,31 @@
 {
     "loop-add-10M": {
-        "//" : "loop-mul.sol: MulPerformanceTester.testAdd(..., ..., 10000000)",
-        "env" : {
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-            "currentNumber" : "9999",
-            "currentGasLimit" : "100000000000",
-            "currentDifficulty" : "20000",
-            "currentTimestamp" : "1",
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "//": "loop-mul.sol: MulPerformanceTester.testAdd(..., ..., 10000000)",
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "20000",
+            "currentGasLimit": "100000000000",
+            "currentNumber": "9999",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x606060405263ffffffff60e060020a60003504166315d42327811461004257806359e3e1ea14610070578063c4f8b9fb1461009e578063e01330bb146100c9575bfe5b341561004a57fe5b61005e6004356024356044356064356100f4565b60408051918252519081900360200190f35b341561007857fe5b61005e60043560243560443560643561011e565b60408051918252519081900360200190f35b34156100a657fe5b61005e600435602435604435610152565b60408051918252519081900360200190f35b34156100d157fe5b61005e600435602435604435610179565b60408051918252519081900360200190f35b600084815b83811015610110578486830991505b6001016100f9565b8192505b5050949350505050565b600084815b8381101561011057858281151561013657fe5b04850191505b600101610123565b8192505b5050949350505050565b600083815b8381101561016c57908401905b600101610157565b8192505b50509392505050565b600083815b8381101561016c57908402905b60010161017e565b8192505b505093925050505600a165627a7a72305820065081bd1e9fdffccd251332523241eaabd0fb1881a06529599a9c67d0a568e50029",
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "0xc4f8b9fb8edad8b55b1586805ea8c245d8c16b06a5102b791fc6eb60693731c0677bf501ff00ffffffffffffffffffffffffffaaffffffffffffffffbbffffffffffffff0000000000000000000000000000000000000000000000000000000000989680",
+            "gas": "1000000000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "0"
+        },
+        "expectOut": "0xa55ad8b55b1586805ea8c245a6177286a5102b791f9e6366693731c066e35e81",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x606060405263ffffffff60e060020a60003504166315d42327811461004257806359e3e1ea14610070578063c4f8b9fb1461009e578063e01330bb146100c9575bfe5b341561004a57fe5b61005e6004356024356044356064356100f4565b60408051918252519081900360200190f35b341561007857fe5b61005e60043560243560443560643561011e565b60408051918252519081900360200190f35b34156100a657fe5b61005e600435602435604435610152565b60408051918252519081900360200190f35b34156100d157fe5b61005e600435602435604435610179565b60408051918252519081900360200190f35b600084815b83811015610110578486830991505b6001016100f9565b8192505b5050949350505050565b600084815b8381101561011057858281151561013657fe5b04850191505b600101610123565b8192505b5050949350505050565b600083815b8381101561016c57908401905b600101610157565b8192505b50509392505050565b600083815b8381101561016c57908402905b60010161017e565b8192505b505093925050505600a165627a7a72305820065081bd1e9fdffccd251332523241eaabd0fb1881a06529599a9c67d0a568e50029",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "0",
-            "data" : "0xc4f8b9fb8edad8b55b1586805ea8c245d8c16b06a5102b791fc6eb60693731c0677bf501ff00ffffffffffffffffffffffffffaaffffffffffffffffbbffffffffffffff0000000000000000000000000000000000000000000000000000000000989680",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000000000"
-        },
-        "expectOut" : "0xa55ad8b55b1586805ea8c245a6177286a5102b791f9e6366693731c066e35e81"
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmPerformance/loop-divadd-10MFiller.json b/src/VMTestsFiller/vmPerformance/loop-divadd-10MFiller.json
index 080b6a456..bee9b3dba 100644
--- a/src/VMTestsFiller/vmPerformance/loop-divadd-10MFiller.json
+++ b/src/VMTestsFiller/vmPerformance/loop-divadd-10MFiller.json
@@ -1,31 +1,31 @@
 {
     "loop-divadd-10M": {
-        "//" : "loop-mul.sol: MulPerformanceTester.testDivAdd(..., ..., ..., 10000000)",
-        "env" : {
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-            "currentNumber" : "9999",
-            "currentGasLimit" : "100000000000",
-            "currentDifficulty" : "20000",
-            "currentTimestamp" : "1",
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "//": "loop-mul.sol: MulPerformanceTester.testDivAdd(..., ..., ..., 10000000)",
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "20000",
+            "currentGasLimit": "100000000000",
+            "currentNumber": "9999",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x606060405263ffffffff60e060020a60003504166315d42327811461004257806359e3e1ea14610070578063c4f8b9fb1461009e578063e01330bb146100c9575bfe5b341561004a57fe5b61005e6004356024356044356064356100f4565b60408051918252519081900360200190f35b341561007857fe5b61005e60043560243560443560643561011e565b60408051918252519081900360200190f35b34156100a657fe5b61005e600435602435604435610152565b60408051918252519081900360200190f35b34156100d157fe5b61005e600435602435604435610179565b60408051918252519081900360200190f35b600084815b83811015610110578486830991505b6001016100f9565b8192505b5050949350505050565b600084815b8381101561011057858281151561013657fe5b04850191505b600101610123565b8192505b5050949350505050565b600083815b8381101561016c57908401905b600101610157565b8192505b50509392505050565b600083815b8381101561016c57908402905b60010161017e565b8192505b505093925050505600a165627a7a72305820065081bd1e9fdffccd251332523241eaabd0fb1881a06529599a9c67d0a568e50029",
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "0x59e3e1ea8edad8b55b1586805ea8c245d8c16b06a5102b791fc6eb60693731c0677bf5011c68db1c179cd35ab3fc60c63704aa7fcbea40f19782b1611aaba86726a7686cff00ffffffffffffffffffffffffffaaffffffffffffffffbbffffffffffffff0000000000000000000000000000000000000000000000000000000000989680",
+            "gas": "1000000000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "0"
+        },
+        "expectOut": "0xff00ffffffffffffffffffffffffffaaffffffffffffffffbc00000000000007",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x606060405263ffffffff60e060020a60003504166315d42327811461004257806359e3e1ea14610070578063c4f8b9fb1461009e578063e01330bb146100c9575bfe5b341561004a57fe5b61005e6004356024356044356064356100f4565b60408051918252519081900360200190f35b341561007857fe5b61005e60043560243560443560643561011e565b60408051918252519081900360200190f35b34156100a657fe5b61005e600435602435604435610152565b60408051918252519081900360200190f35b34156100d157fe5b61005e600435602435604435610179565b60408051918252519081900360200190f35b600084815b83811015610110578486830991505b6001016100f9565b8192505b5050949350505050565b600084815b8381101561011057858281151561013657fe5b04850191505b600101610123565b8192505b5050949350505050565b600083815b8381101561016c57908401905b600101610157565b8192505b50509392505050565b600083815b8381101561016c57908402905b60010161017e565b8192505b505093925050505600a165627a7a72305820065081bd1e9fdffccd251332523241eaabd0fb1881a06529599a9c67d0a568e50029",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "0",
-            "data" : "0x59e3e1ea8edad8b55b1586805ea8c245d8c16b06a5102b791fc6eb60693731c0677bf5011c68db1c179cd35ab3fc60c63704aa7fcbea40f19782b1611aaba86726a7686cff00ffffffffffffffffffffffffffaaffffffffffffffffbbffffffffffffff0000000000000000000000000000000000000000000000000000000000989680",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000000000"
-        },
-        "expectOut" : "0xff00ffffffffffffffffffffffffffaaffffffffffffffffbc00000000000007"
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmPerformance/loop-divadd-unr100-10MFiller.json b/src/VMTestsFiller/vmPerformance/loop-divadd-unr100-10MFiller.json
index 1bf98fca4..1f8e96586 100644
--- a/src/VMTestsFiller/vmPerformance/loop-divadd-unr100-10MFiller.json
+++ b/src/VMTestsFiller/vmPerformance/loop-divadd-unr100-10MFiller.json
@@ -1,30 +1,30 @@
 {
     "loop-divadd-unr100-10M": {
-        "//" : "loop-mul.sol: MulPerformanceTester.testDivUnrolled100(..., ..., ..., 10000000)",
-        "env" : {
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-            "currentNumber" : "9999",
-            "currentGasLimit" : "100000000000",
-            "currentDifficulty" : "20000",
-            "currentTimestamp" : "1",
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "//": "loop-mul.sol: MulPerformanceTester.testDivUnrolled100(..., ..., ..., 10000000)",
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "20000",
+            "currentGasLimit": "100000000000",
+            "currentNumber": "9999",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680635bc0d2f11461003b575bfe5b341561004357fe5b610074600480803590602001909190803590602001909190803590602001909190803590602001909190505061008a565b6040518082815260200191505060405180910390f35b600060006000869150600090505b838110156108185785828115156100ab57fe5b049150848201915085828115156100be57fe5b049150848201915085828115156100d157fe5b049150848201915085828115156100e457fe5b049150848201915085828115156100f757fe5b0491508482019150858281151561010a57fe5b0491508482019150858281151561011d57fe5b0491508482019150858281151561013057fe5b0491508482019150858281151561014357fe5b0491508482019150858281151561015657fe5b0491508482019150858281151561016957fe5b0491508482019150858281151561017c57fe5b0491508482019150858281151561018f57fe5b049150848201915085828115156101a257fe5b049150848201915085828115156101b557fe5b049150848201915085828115156101c857fe5b049150848201915085828115156101db57fe5b049150848201915085828115156101ee57fe5b0491508482019150858281151561020157fe5b0491508482019150858281151561021457fe5b0491508482019150858281151561022757fe5b0491508482019150858281151561023a57fe5b0491508482019150858281151561024d57fe5b0491508482019150858281151561026057fe5b0491508482019150858281151561027357fe5b0491508482019150858281151561028657fe5b0491508482019150858281151561029957fe5b049150848201915085828115156102ac57fe5b049150848201915085828115156102bf57fe5b049150848201915085828115156102d257fe5b049150848201915085828115156102e557fe5b049150848201915085828115156102f857fe5b0491508482019150858281151561030b57fe5b0491508482019150858281151561031e57fe5b0491508482019150858281151561033157fe5b0491508482019150858281151561034457fe5b0491508482019150858281151561035757fe5b0491508482019150858281151561036a57fe5b0491508482019150858281151561037d57fe5b0491508482019150858281151561039057fe5b049150848201915085828115156103a357fe5b049150848201915085828115156103b657fe5b049150848201915085828115156103c957fe5b049150848201915085828115156103dc57fe5b049150848201915085828115156103ef57fe5b0491508482019150858281151561040257fe5b0491508482019150858281151561041557fe5b0491508482019150858281151561042857fe5b0491508482019150858281151561043b57fe5b0491508482019150858281151561044e57fe5b0491508482019150858281151561046157fe5b0491508482019150858281151561047457fe5b0491508482019150858281151561048757fe5b0491508482019150858281151561049a57fe5b049150848201915085828115156104ad57fe5b049150848201915085828115156104c057fe5b049150848201915085828115156104d357fe5b049150848201915085828115156104e657fe5b049150848201915085828115156104f957fe5b0491508482019150858281151561050c57fe5b0491508482019150858281151561051f57fe5b0491508482019150858281151561053257fe5b0491508482019150858281151561054557fe5b0491508482019150858281151561055857fe5b0491508482019150858281151561056b57fe5b0491508482019150858281151561057e57fe5b0491508482019150858281151561059157fe5b049150848201915085828115156105a457fe5b049150848201915085828115156105b757fe5b049150848201915085828115156105ca57fe5b049150848201915085828115156105dd57fe5b049150848201915085828115156105f057fe5b0491508482019150858281151561060357fe5b0491508482019150858281151561061657fe5b0491508482019150858281151561062957fe5b0491508482019150858281151561063c57fe5b0491508482019150858281151561064f57fe5b0491508482019150858281151561066257fe5b0491508482019150858281151561067557fe5b0491508482019150858281151561068857fe5b0491508482019150858281151561069b57fe5b049150848201915085828115156106ae57fe5b049150848201915085828115156106c157fe5b049150848201915085828115156106d457fe5b049150848201915085828115156106e757fe5b049150848201915085828115156106fa57fe5b0491508482019150858281151561070d57fe5b0491508482019150858281151561072057fe5b0491508482019150858281151561073357fe5b0491508482019150858281151561074657fe5b0491508482019150858281151561075957fe5b0491508482019150858281151561076c57fe5b0491508482019150858281151561077f57fe5b0491508482019150858281151561079257fe5b049150848201915085828115156107a557fe5b049150848201915085828115156107b857fe5b049150848201915085828115156107cb57fe5b049150848201915085828115156107de57fe5b049150848201915085828115156107f157fe5b0491508482019150858281151561080457fe5b04915084820191505b606481019050610098565b8192505b50509493505050505600a165627a7a72305820c38c20b72770ea745144fec130354270a65a17f75c8e4d1ad15808766d62bcdc0029",
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "0x5bc0d2f18edad8b55b1586805ea8c245d8c16b06a5102b791fc6eb60693731c0677bf5011c68db1c179cd35ab3fc60c63704aa7fcbea40f19782b1611aaba86726a7686cff00ffffffffffffffffffffffffffaaffffffffffffffffbbffffffffffffff0000000000000000000000000000000000000000000000000000000000989680",
+            "gas": "1000000000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "0"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x60606040526000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680635bc0d2f11461003b575bfe5b341561004357fe5b610074600480803590602001909190803590602001909190803590602001909190803590602001909190505061008a565b6040518082815260200191505060405180910390f35b600060006000869150600090505b838110156108185785828115156100ab57fe5b049150848201915085828115156100be57fe5b049150848201915085828115156100d157fe5b049150848201915085828115156100e457fe5b049150848201915085828115156100f757fe5b0491508482019150858281151561010a57fe5b0491508482019150858281151561011d57fe5b0491508482019150858281151561013057fe5b0491508482019150858281151561014357fe5b0491508482019150858281151561015657fe5b0491508482019150858281151561016957fe5b0491508482019150858281151561017c57fe5b0491508482019150858281151561018f57fe5b049150848201915085828115156101a257fe5b049150848201915085828115156101b557fe5b049150848201915085828115156101c857fe5b049150848201915085828115156101db57fe5b049150848201915085828115156101ee57fe5b0491508482019150858281151561020157fe5b0491508482019150858281151561021457fe5b0491508482019150858281151561022757fe5b0491508482019150858281151561023a57fe5b0491508482019150858281151561024d57fe5b0491508482019150858281151561026057fe5b0491508482019150858281151561027357fe5b0491508482019150858281151561028657fe5b0491508482019150858281151561029957fe5b049150848201915085828115156102ac57fe5b049150848201915085828115156102bf57fe5b049150848201915085828115156102d257fe5b049150848201915085828115156102e557fe5b049150848201915085828115156102f857fe5b0491508482019150858281151561030b57fe5b0491508482019150858281151561031e57fe5b0491508482019150858281151561033157fe5b0491508482019150858281151561034457fe5b0491508482019150858281151561035757fe5b0491508482019150858281151561036a57fe5b0491508482019150858281151561037d57fe5b0491508482019150858281151561039057fe5b049150848201915085828115156103a357fe5b049150848201915085828115156103b657fe5b049150848201915085828115156103c957fe5b049150848201915085828115156103dc57fe5b049150848201915085828115156103ef57fe5b0491508482019150858281151561040257fe5b0491508482019150858281151561041557fe5b0491508482019150858281151561042857fe5b0491508482019150858281151561043b57fe5b0491508482019150858281151561044e57fe5b0491508482019150858281151561046157fe5b0491508482019150858281151561047457fe5b0491508482019150858281151561048757fe5b0491508482019150858281151561049a57fe5b049150848201915085828115156104ad57fe5b049150848201915085828115156104c057fe5b049150848201915085828115156104d357fe5b049150848201915085828115156104e657fe5b049150848201915085828115156104f957fe5b0491508482019150858281151561050c57fe5b0491508482019150858281151561051f57fe5b0491508482019150858281151561053257fe5b0491508482019150858281151561054557fe5b0491508482019150858281151561055857fe5b0491508482019150858281151561056b57fe5b0491508482019150858281151561057e57fe5b0491508482019150858281151561059157fe5b049150848201915085828115156105a457fe5b049150848201915085828115156105b757fe5b049150848201915085828115156105ca57fe5b049150848201915085828115156105dd57fe5b049150848201915085828115156105f057fe5b0491508482019150858281151561060357fe5b0491508482019150858281151561061657fe5b0491508482019150858281151561062957fe5b0491508482019150858281151561063c57fe5b0491508482019150858281151561064f57fe5b0491508482019150858281151561066257fe5b0491508482019150858281151561067557fe5b0491508482019150858281151561068857fe5b0491508482019150858281151561069b57fe5b049150848201915085828115156106ae57fe5b049150848201915085828115156106c157fe5b049150848201915085828115156106d457fe5b049150848201915085828115156106e757fe5b049150848201915085828115156106fa57fe5b0491508482019150858281151561070d57fe5b0491508482019150858281151561072057fe5b0491508482019150858281151561073357fe5b0491508482019150858281151561074657fe5b0491508482019150858281151561075957fe5b0491508482019150858281151561076c57fe5b0491508482019150858281151561077f57fe5b0491508482019150858281151561079257fe5b049150848201915085828115156107a557fe5b049150848201915085828115156107b857fe5b049150848201915085828115156107cb57fe5b049150848201915085828115156107de57fe5b049150848201915085828115156107f157fe5b0491508482019150858281151561080457fe5b04915084820191505b606481019050610098565b8192505b50509493505050505600a165627a7a72305820c38c20b72770ea745144fec130354270a65a17f75c8e4d1ad15808766d62bcdc0029",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "0",
-            "data" : "0x5bc0d2f18edad8b55b1586805ea8c245d8c16b06a5102b791fc6eb60693731c0677bf5011c68db1c179cd35ab3fc60c63704aa7fcbea40f19782b1611aaba86726a7686cff00ffffffffffffffffffffffffffaaffffffffffffffffbbffffffffffffff0000000000000000000000000000000000000000000000000000000000989680",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmPerformance/loop-exp-16b-100kFiller.json b/src/VMTestsFiller/vmPerformance/loop-exp-16b-100kFiller.json
index 7e41497ad..baa38ed3e 100644
--- a/src/VMTestsFiller/vmPerformance/loop-exp-16b-100kFiller.json
+++ b/src/VMTestsFiller/vmPerformance/loop-exp-16b-100kFiller.json
@@ -1,39 +1,37 @@
 {
-    "loop-exp-16b-100k" : {
-         "//" : "loop-exp.sol: ExpPerformanceTester.testExp(2^128-1, 6364136223846793005, 100000)",
-         "env" : {
-             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-             "currentDifficulty" : "0x4e20",
-             "currentGasLimit" : "0x174876e800",
-             "currentNumber" : "0x270f",
-             "currentTimestamp" : "0x01"
-         },
-         "exec" : {
-             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-             "code" : "0x606060405260e060020a60003504633392ffc8811461003f5780633c77b95c1461006a578063ce67bda6146100c2578063ebbbe00b146100e8575b610002565b346100025761010e600435602435604435600082815b83811015610120579085900a90600101610055565b346100025761010e600435602435604435600082815b83811015610120579085900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a90601001610080565b346100025761010e6004356024356044356000805b82811015610129575b6001016100d7565b346100025761010e6004356024356044356000805b82811015610129575b6010016100fd565b60408051918252519081900360200190f35b50949350505050565b5091939250505056",
-             "data" : "0x3392ffc800000000000000000000000000000000ffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000005851f42d4c957f2d00000000000000000000000000000000000000000000000000000000000186a0",
-             "gas" : "0xe8d4a51000",
-             "gasPrice" : "0x5af3107a4000",
-             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-             "value" : "0x00"
-         },
-         "expectOut" : "0xb23af8a01bc4dfc6f808935d77dbab8000000000000000005851f42d4c957f2d",
-         "expect" : {
-             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                 "nonce" : "0x00",
-                 "storage" : {
-                 }
-             }
-         },
-         "pre" : {
-             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                 "balance" : "0x152d02c7e14af6800000",
-                 "code" : "0x606060405260e060020a60003504633392ffc8811461003f5780633c77b95c1461006a578063ce67bda6146100c2578063ebbbe00b146100e8575b610002565b346100025761010e600435602435604435600082815b83811015610120579085900a90600101610055565b346100025761010e600435602435604435600082815b83811015610120579085900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a90601001610080565b346100025761010e6004356024356044356000805b82811015610129575b6001016100d7565b346100025761010e6004356024356044356000805b82811015610129575b6010016100fd565b60408051918252519081900360200190f35b50949350505050565b5091939250505056",
-                 "nonce" : "0x00",
-                 "storage" : {
-                 }
-             }
-         }
-     }
-}
+    "loop-exp-16b-100k": {
+        "//": "loop-exp.sol: ExpPerformanceTester.testExp(2^128-1, 6364136223846793005, 100000)",
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "0x4e20",
+            "currentGasLimit": "0x174876e800",
+            "currentNumber": "0x270f",
+            "currentTimestamp": "0x01"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "code": "0x606060405260e060020a60003504633392ffc8811461003f5780633c77b95c1461006a578063ce67bda6146100c2578063ebbbe00b146100e8575b610002565b346100025761010e600435602435604435600082815b83811015610120579085900a90600101610055565b346100025761010e600435602435604435600082815b83811015610120579085900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a90601001610080565b346100025761010e6004356024356044356000805b82811015610129575b6001016100d7565b346100025761010e6004356024356044356000805b82811015610129575b6010016100fd565b60408051918252519081900360200190f35b50949350505050565b5091939250505056",
+            "data": "0x3392ffc800000000000000000000000000000000ffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000005851f42d4c957f2d00000000000000000000000000000000000000000000000000000000000186a0",
+            "gas": "0xe8d4a51000",
+            "gasPrice": "0x5af3107a4000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "0x00"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "nonce": "0x00",
+                "storage": {}
+            }
+        },
+        "expectOut": "0xb23af8a01bc4dfc6f808935d77dbab8000000000000000005851f42d4c957f2d",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "0x152d02c7e14af6800000",
+                "code": "0x606060405260e060020a60003504633392ffc8811461003f5780633c77b95c1461006a578063ce67bda6146100c2578063ebbbe00b146100e8575b610002565b346100025761010e600435602435604435600082815b83811015610120579085900a90600101610055565b346100025761010e600435602435604435600082815b83811015610120579085900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a90601001610080565b346100025761010e6004356024356044356000805b82811015610129575b6001016100d7565b346100025761010e6004356024356044356000805b82811015610129575b6010016100fd565b60408051918252519081900360200190f35b50949350505050565b5091939250505056",
+                "nonce": "0x00",
+                "storage": {}
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmPerformance/loop-exp-1b-1MFiller.json b/src/VMTestsFiller/vmPerformance/loop-exp-1b-1MFiller.json
index e91debb86..7dcafcd6e 100644
--- a/src/VMTestsFiller/vmPerformance/loop-exp-1b-1MFiller.json
+++ b/src/VMTestsFiller/vmPerformance/loop-exp-1b-1MFiller.json
@@ -1,39 +1,37 @@
 {
-    "loop-exp-1b-1M" : {
-         "//" : "loop-exp.sol: ExpPerformanceTester.testExp(255, 6364136223846793005, 1000000)",
-         "env" : {
-             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-             "currentDifficulty" : "0x4e20",
-             "currentGasLimit" : "0x174876e800",
-             "currentNumber" : "0x270f",
-             "currentTimestamp" : "0x01"
-         },
-         "exec" : {
-             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-             "code" : "0x606060405260e060020a60003504633392ffc8811461003f5780633c77b95c1461006a578063ce67bda6146100c2578063ebbbe00b146100e8575b610002565b346100025761010e600435602435604435600082815b83811015610120579085900a90600101610055565b346100025761010e600435602435604435600082815b83811015610120579085900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a90601001610080565b346100025761010e6004356024356044356000805b82811015610129575b6001016100d7565b346100025761010e6004356024356044356000805b82811015610129575b6010016100fd565b60408051918252519081900360200190f35b50949350505050565b5091939250505056",
-             "data" : "0x3392ffc800000000000000000000000000000000000000000000000000000000000000ff0000000000000000000000000000000000000000000000005851f42d4c957f2d00000000000000000000000000000000000000000000000000000000000f4240",
-             "gas" : "0xe8d4a51000",
-             "gasPrice" : "0x5af3107a4000",
-             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-             "value" : "0x00"
-         },
-         "expectOut" : "0x7dd3cdcdaa09b68a42b5ac372018960fcb3daae20a0d41f9e6b507245ac87f2d",
-         "expect" : {
-             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                 "nonce" : "0x00",
-                 "storage" : {
-                 }
-             }
-         },
-         "pre" : {
-             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                 "balance" : "0x152d02c7e14af6800000",
-                 "code" : "0x606060405260e060020a60003504633392ffc8811461003f5780633c77b95c1461006a578063ce67bda6146100c2578063ebbbe00b146100e8575b610002565b346100025761010e600435602435604435600082815b83811015610120579085900a90600101610055565b346100025761010e600435602435604435600082815b83811015610120579085900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a90601001610080565b346100025761010e6004356024356044356000805b82811015610129575b6001016100d7565b346100025761010e6004356024356044356000805b82811015610129575b6010016100fd565b60408051918252519081900360200190f35b50949350505050565b5091939250505056",
-                 "nonce" : "0x00",
-                 "storage" : {
-                 }
-             }
-         }
-     }
-}
+    "loop-exp-1b-1M": {
+        "//": "loop-exp.sol: ExpPerformanceTester.testExp(255, 6364136223846793005, 1000000)",
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "0x4e20",
+            "currentGasLimit": "0x174876e800",
+            "currentNumber": "0x270f",
+            "currentTimestamp": "0x01"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "code": "0x606060405260e060020a60003504633392ffc8811461003f5780633c77b95c1461006a578063ce67bda6146100c2578063ebbbe00b146100e8575b610002565b346100025761010e600435602435604435600082815b83811015610120579085900a90600101610055565b346100025761010e600435602435604435600082815b83811015610120579085900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a90601001610080565b346100025761010e6004356024356044356000805b82811015610129575b6001016100d7565b346100025761010e6004356024356044356000805b82811015610129575b6010016100fd565b60408051918252519081900360200190f35b50949350505050565b5091939250505056",
+            "data": "0x3392ffc800000000000000000000000000000000000000000000000000000000000000ff0000000000000000000000000000000000000000000000005851f42d4c957f2d00000000000000000000000000000000000000000000000000000000000f4240",
+            "gas": "0xe8d4a51000",
+            "gasPrice": "0x5af3107a4000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "0x00"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "nonce": "0x00",
+                "storage": {}
+            }
+        },
+        "expectOut": "0x7dd3cdcdaa09b68a42b5ac372018960fcb3daae20a0d41f9e6b507245ac87f2d",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "0x152d02c7e14af6800000",
+                "code": "0x606060405260e060020a60003504633392ffc8811461003f5780633c77b95c1461006a578063ce67bda6146100c2578063ebbbe00b146100e8575b610002565b346100025761010e600435602435604435600082815b83811015610120579085900a90600101610055565b346100025761010e600435602435604435600082815b83811015610120579085900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a90601001610080565b346100025761010e6004356024356044356000805b82811015610129575b6001016100d7565b346100025761010e6004356024356044356000805b82811015610129575b6010016100fd565b60408051918252519081900360200190f35b50949350505050565b5091939250505056",
+                "nonce": "0x00",
+                "storage": {}
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmPerformance/loop-exp-2b-100kFiller.json b/src/VMTestsFiller/vmPerformance/loop-exp-2b-100kFiller.json
index a4ef443ad..6c3be3d5d 100644
--- a/src/VMTestsFiller/vmPerformance/loop-exp-2b-100kFiller.json
+++ b/src/VMTestsFiller/vmPerformance/loop-exp-2b-100kFiller.json
@@ -1,39 +1,37 @@
 {
-    "loop-exp-2b-100k" : {
-         "//" : "loop-exp.sol: ExpPerformanceTester.testExp(65535, 6364136223846793005, 100000)",
-         "env" : {
-             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-             "currentDifficulty" : "0x4e20",
-             "currentGasLimit" : "0x174876e800",
-             "currentNumber" : "0x270f",
-             "currentTimestamp" : "0x01"
-         },
-         "exec" : {
-             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-             "code" : "0x606060405260e060020a60003504633392ffc8811461003f5780633c77b95c1461006a578063ce67bda6146100c2578063ebbbe00b146100e8575b610002565b346100025761010e600435602435604435600082815b83811015610120579085900a90600101610055565b346100025761010e600435602435604435600082815b83811015610120579085900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a90601001610080565b346100025761010e6004356024356044356000805b82811015610129575b6001016100d7565b346100025761010e6004356024356044356000805b82811015610129575b6010016100fd565b60408051918252519081900360200190f35b50949350505050565b5091939250505056",
-             "data" : "0x3392ffc8000000000000000000000000000000000000000000000000000000000000ffff0000000000000000000000000000000000000000000000005851f42d4c957f2d00000000000000000000000000000000000000000000000000000000000186a0",
-             "gas" : "0xe8d4a51000",
-             "gasPrice" : "0x5af3107a4000",
-             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-             "value" : "0x00"
-         },
-         "expectOut" : "0x87b9c676d0fd90e2d05a9f8621a374edc678a3fc7209929731e3c9c8f8157f2d",
-         "expect" : {
-             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                 "nonce" : "0x00",
-                 "storage" : {
-                 }
-             }
-         },
-         "pre" : {
-             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                 "balance" : "0x152d02c7e14af6800000",
-                 "code" : "0x606060405260e060020a60003504633392ffc8811461003f5780633c77b95c1461006a578063ce67bda6146100c2578063ebbbe00b146100e8575b610002565b346100025761010e600435602435604435600082815b83811015610120579085900a90600101610055565b346100025761010e600435602435604435600082815b83811015610120579085900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a90601001610080565b346100025761010e6004356024356044356000805b82811015610129575b6001016100d7565b346100025761010e6004356024356044356000805b82811015610129575b6010016100fd565b60408051918252519081900360200190f35b50949350505050565b5091939250505056",
-                 "nonce" : "0x00",
-                 "storage" : {
-                 }
-             }
-         }
-     }
-}
+    "loop-exp-2b-100k": {
+        "//": "loop-exp.sol: ExpPerformanceTester.testExp(65535, 6364136223846793005, 100000)",
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "0x4e20",
+            "currentGasLimit": "0x174876e800",
+            "currentNumber": "0x270f",
+            "currentTimestamp": "0x01"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "code": "0x606060405260e060020a60003504633392ffc8811461003f5780633c77b95c1461006a578063ce67bda6146100c2578063ebbbe00b146100e8575b610002565b346100025761010e600435602435604435600082815b83811015610120579085900a90600101610055565b346100025761010e600435602435604435600082815b83811015610120579085900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a90601001610080565b346100025761010e6004356024356044356000805b82811015610129575b6001016100d7565b346100025761010e6004356024356044356000805b82811015610129575b6010016100fd565b60408051918252519081900360200190f35b50949350505050565b5091939250505056",
+            "data": "0x3392ffc8000000000000000000000000000000000000000000000000000000000000ffff0000000000000000000000000000000000000000000000005851f42d4c957f2d00000000000000000000000000000000000000000000000000000000000186a0",
+            "gas": "0xe8d4a51000",
+            "gasPrice": "0x5af3107a4000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "0x00"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "nonce": "0x00",
+                "storage": {}
+            }
+        },
+        "expectOut": "0x87b9c676d0fd90e2d05a9f8621a374edc678a3fc7209929731e3c9c8f8157f2d",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "0x152d02c7e14af6800000",
+                "code": "0x606060405260e060020a60003504633392ffc8811461003f5780633c77b95c1461006a578063ce67bda6146100c2578063ebbbe00b146100e8575b610002565b346100025761010e600435602435604435600082815b83811015610120579085900a90600101610055565b346100025761010e600435602435604435600082815b83811015610120579085900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a90601001610080565b346100025761010e6004356024356044356000805b82811015610129575b6001016100d7565b346100025761010e6004356024356044356000805b82811015610129575b6010016100fd565b60408051918252519081900360200190f35b50949350505050565b5091939250505056",
+                "nonce": "0x00",
+                "storage": {}
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmPerformance/loop-exp-32b-100kFiller.json b/src/VMTestsFiller/vmPerformance/loop-exp-32b-100kFiller.json
index 16980a32e..9cdf1eed2 100644
--- a/src/VMTestsFiller/vmPerformance/loop-exp-32b-100kFiller.json
+++ b/src/VMTestsFiller/vmPerformance/loop-exp-32b-100kFiller.json
@@ -1,39 +1,37 @@
 {
-    "loop-exp-32b-100k" : {
-         "//" : "loop-exp.sol: ExpPerformanceTester.testExp(2^256-1, 6364136223846793005, 100000)",
-         "env" : {
-             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-             "currentDifficulty" : "0x4e20",
-             "currentGasLimit" : "0x174876e800",
-             "currentNumber" : "0x270f",
-             "currentTimestamp" : "0x01"
-         },
-         "exec" : {
-             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-             "code" : "0x606060405260e060020a60003504633392ffc8811461003f5780633c77b95c1461006a578063ce67bda6146100c2578063ebbbe00b146100e8575b610002565b346100025761010e600435602435604435600082815b83811015610120579085900a90600101610055565b346100025761010e600435602435604435600082815b83811015610120579085900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a90601001610080565b346100025761010e6004356024356044356000805b82811015610129575b6001016100d7565b346100025761010e6004356024356044356000805b82811015610129575b6010016100fd565b60408051918252519081900360200190f35b50949350505050565b5091939250505056",
-             "data" : "0x3392ffc8ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000005851f42d4c957f2d00000000000000000000000000000000000000000000000000000000000186a0",
-             "gas" : "0xe8d4a51000",
-             "gasPrice" : "0x5af3107a4000",
-             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-             "value" : "0x00"
-         },
-         "expectOut" : "0x0000000000000000000000000000000000000000000000005851f42d4c957f2d",
-         "expect" : {
-             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                 "nonce" : "0x00",
-                 "storage" : {
-                 }
-             }
-         },
-         "pre" : {
-             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                 "balance" : "0x152d02c7e14af6800000",
-                 "code" : "0x606060405260e060020a60003504633392ffc8811461003f5780633c77b95c1461006a578063ce67bda6146100c2578063ebbbe00b146100e8575b610002565b346100025761010e600435602435604435600082815b83811015610120579085900a90600101610055565b346100025761010e600435602435604435600082815b83811015610120579085900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a90601001610080565b346100025761010e6004356024356044356000805b82811015610129575b6001016100d7565b346100025761010e6004356024356044356000805b82811015610129575b6010016100fd565b60408051918252519081900360200190f35b50949350505050565b5091939250505056",
-                 "nonce" : "0x00",
-                 "storage" : {
-                 }
-             }
-         }
-     }
-}
+    "loop-exp-32b-100k": {
+        "//": "loop-exp.sol: ExpPerformanceTester.testExp(2^256-1, 6364136223846793005, 100000)",
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "0x4e20",
+            "currentGasLimit": "0x174876e800",
+            "currentNumber": "0x270f",
+            "currentTimestamp": "0x01"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "code": "0x606060405260e060020a60003504633392ffc8811461003f5780633c77b95c1461006a578063ce67bda6146100c2578063ebbbe00b146100e8575b610002565b346100025761010e600435602435604435600082815b83811015610120579085900a90600101610055565b346100025761010e600435602435604435600082815b83811015610120579085900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a90601001610080565b346100025761010e6004356024356044356000805b82811015610129575b6001016100d7565b346100025761010e6004356024356044356000805b82811015610129575b6010016100fd565b60408051918252519081900360200190f35b50949350505050565b5091939250505056",
+            "data": "0x3392ffc8ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000000000000000000000000000000000005851f42d4c957f2d00000000000000000000000000000000000000000000000000000000000186a0",
+            "gas": "0xe8d4a51000",
+            "gasPrice": "0x5af3107a4000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "0x00"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "nonce": "0x00",
+                "storage": {}
+            }
+        },
+        "expectOut": "0x0000000000000000000000000000000000000000000000005851f42d4c957f2d",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "0x152d02c7e14af6800000",
+                "code": "0x606060405260e060020a60003504633392ffc8811461003f5780633c77b95c1461006a578063ce67bda6146100c2578063ebbbe00b146100e8575b610002565b346100025761010e600435602435604435600082815b83811015610120579085900a90600101610055565b346100025761010e600435602435604435600082815b83811015610120579085900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a90601001610080565b346100025761010e6004356024356044356000805b82811015610129575b6001016100d7565b346100025761010e6004356024356044356000805b82811015610129575b6010016100fd565b60408051918252519081900360200190f35b50949350505050565b5091939250505056",
+                "nonce": "0x00",
+                "storage": {}
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmPerformance/loop-exp-4b-100kFiller.json b/src/VMTestsFiller/vmPerformance/loop-exp-4b-100kFiller.json
index ae9cf8ab9..6d892f718 100644
--- a/src/VMTestsFiller/vmPerformance/loop-exp-4b-100kFiller.json
+++ b/src/VMTestsFiller/vmPerformance/loop-exp-4b-100kFiller.json
@@ -1,39 +1,37 @@
 {
-    "loop-exp-4b-100k" : {
-         "//" : "loop-exp.sol: ExpPerformanceTester.testExp(2^32-1, 6364136223846793005, 100000)",
-         "env" : {
-             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-             "currentDifficulty" : "0x4e20",
-             "currentGasLimit" : "0x174876e800",
-             "currentNumber" : "0x270f",
-             "currentTimestamp" : "0x01"
-         },
-         "exec" : {
-             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-             "code" : "0x606060405260e060020a60003504633392ffc8811461003f5780633c77b95c1461006a578063ce67bda6146100c2578063ebbbe00b146100e8575b610002565b346100025761010e600435602435604435600082815b83811015610120579085900a90600101610055565b346100025761010e600435602435604435600082815b83811015610120579085900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a90601001610080565b346100025761010e6004356024356044356000805b82811015610129575b6001016100d7565b346100025761010e6004356024356044356000805b82811015610129575b6010016100fd565b60408051918252519081900360200190f35b50949350505050565b5091939250505056",
-             "data" : "0x3392ffc800000000000000000000000000000000000000000000000000000000ffffffff0000000000000000000000000000000000000000000000005851f42d4c957f2d00000000000000000000000000000000000000000000000000000000000186a0",
-             "gas" : "0xe8d4a51000",
-             "gasPrice" : "0x5af3107a4000",
-             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-             "value" : "0x00"
-         },
-         "expectOut" : "0xd0e61f591bd78de46f37ced3590d1b5b8c9534ef27bcf11dd02d9fad4c957f2d",
-         "expect" : {
-             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                 "nonce" : "0x00",
-                 "storage" : {
-                 }
-             }
-         },
-         "pre" : {
-             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                 "balance" : "0x152d02c7e14af6800000",
-                 "code" : "0x606060405260e060020a60003504633392ffc8811461003f5780633c77b95c1461006a578063ce67bda6146100c2578063ebbbe00b146100e8575b610002565b346100025761010e600435602435604435600082815b83811015610120579085900a90600101610055565b346100025761010e600435602435604435600082815b83811015610120579085900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a90601001610080565b346100025761010e6004356024356044356000805b82811015610129575b6001016100d7565b346100025761010e6004356024356044356000805b82811015610129575b6010016100fd565b60408051918252519081900360200190f35b50949350505050565b5091939250505056",
-                 "nonce" : "0x00",
-                 "storage" : {
-                 }
-             }
-         }
-     }
-}
+    "loop-exp-4b-100k": {
+        "//": "loop-exp.sol: ExpPerformanceTester.testExp(2^32-1, 6364136223846793005, 100000)",
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "0x4e20",
+            "currentGasLimit": "0x174876e800",
+            "currentNumber": "0x270f",
+            "currentTimestamp": "0x01"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "code": "0x606060405260e060020a60003504633392ffc8811461003f5780633c77b95c1461006a578063ce67bda6146100c2578063ebbbe00b146100e8575b610002565b346100025761010e600435602435604435600082815b83811015610120579085900a90600101610055565b346100025761010e600435602435604435600082815b83811015610120579085900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a90601001610080565b346100025761010e6004356024356044356000805b82811015610129575b6001016100d7565b346100025761010e6004356024356044356000805b82811015610129575b6010016100fd565b60408051918252519081900360200190f35b50949350505050565b5091939250505056",
+            "data": "0x3392ffc800000000000000000000000000000000000000000000000000000000ffffffff0000000000000000000000000000000000000000000000005851f42d4c957f2d00000000000000000000000000000000000000000000000000000000000186a0",
+            "gas": "0xe8d4a51000",
+            "gasPrice": "0x5af3107a4000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "0x00"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "nonce": "0x00",
+                "storage": {}
+            }
+        },
+        "expectOut": "0xd0e61f591bd78de46f37ced3590d1b5b8c9534ef27bcf11dd02d9fad4c957f2d",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "0x152d02c7e14af6800000",
+                "code": "0x606060405260e060020a60003504633392ffc8811461003f5780633c77b95c1461006a578063ce67bda6146100c2578063ebbbe00b146100e8575b610002565b346100025761010e600435602435604435600082815b83811015610120579085900a90600101610055565b346100025761010e600435602435604435600082815b83811015610120579085900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a90601001610080565b346100025761010e6004356024356044356000805b82811015610129575b6001016100d7565b346100025761010e6004356024356044356000805b82811015610129575b6010016100fd565b60408051918252519081900360200190f35b50949350505050565b5091939250505056",
+                "nonce": "0x00",
+                "storage": {}
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmPerformance/loop-exp-8b-100kFiller.json b/src/VMTestsFiller/vmPerformance/loop-exp-8b-100kFiller.json
index bc913ff32..f073a33db 100644
--- a/src/VMTestsFiller/vmPerformance/loop-exp-8b-100kFiller.json
+++ b/src/VMTestsFiller/vmPerformance/loop-exp-8b-100kFiller.json
@@ -1,39 +1,37 @@
 {
-    "loop-exp-8b-100k" : {
-         "//" : "loop-exp.sol: ExpPerformanceTester.testExp(2^64-1, 6364136223846793005, 100000)",
-         "env" : {
-             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-             "currentDifficulty" : "0x4e20",
-             "currentGasLimit" : "0x174876e800",
-             "currentNumber" : "0x270f",
-             "currentTimestamp" : "0x01"
-         },
-         "exec" : {
-             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-             "code" : "0x606060405260e060020a60003504633392ffc8811461003f5780633c77b95c1461006a578063ce67bda6146100c2578063ebbbe00b146100e8575b610002565b346100025761010e600435602435604435600082815b83811015610120579085900a90600101610055565b346100025761010e600435602435604435600082815b83811015610120579085900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a90601001610080565b346100025761010e6004356024356044356000805b82811015610129575b6001016100d7565b346100025761010e6004356024356044356000805b82811015610129575b6010016100fd565b60408051918252519081900360200190f35b50949350505050565b5091939250505056",
-             "data" : "0x3392ffc8000000000000000000000000000000000000000000000000ffffffffffffffff0000000000000000000000000000000000000000000000005851f42d4c957f2d00000000000000000000000000000000000000000000000000000000000186a0",
-             "gas" : "0xe8d4a51000",
-             "gasPrice" : "0x5af3107a4000",
-             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-             "value" : "0x00"
-         },
-         "expectOut" : "0xa0b60baf8a7d5ff1840537484b793d86f808935d77dbab805851f42d4c957f2d",
-         "expect" : {
-             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-		 "nonce" : "0x00",
-                 "storage" : {
-                 }
-             }
-         },
-         "pre" : {
-             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                 "balance" : "0x152d02c7e14af6800000",
-                 "code" : "0x606060405260e060020a60003504633392ffc8811461003f5780633c77b95c1461006a578063ce67bda6146100c2578063ebbbe00b146100e8575b610002565b346100025761010e600435602435604435600082815b83811015610120579085900a90600101610055565b346100025761010e600435602435604435600082815b83811015610120579085900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a90601001610080565b346100025761010e6004356024356044356000805b82811015610129575b6001016100d7565b346100025761010e6004356024356044356000805b82811015610129575b6010016100fd565b60408051918252519081900360200190f35b50949350505050565b5091939250505056",
-                 "nonce" : "0x00",
-                 "storage" : {
-                 }
-             }
-         }
-     }
-}
+    "loop-exp-8b-100k": {
+        "//": "loop-exp.sol: ExpPerformanceTester.testExp(2^64-1, 6364136223846793005, 100000)",
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "0x4e20",
+            "currentGasLimit": "0x174876e800",
+            "currentNumber": "0x270f",
+            "currentTimestamp": "0x01"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "code": "0x606060405260e060020a60003504633392ffc8811461003f5780633c77b95c1461006a578063ce67bda6146100c2578063ebbbe00b146100e8575b610002565b346100025761010e600435602435604435600082815b83811015610120579085900a90600101610055565b346100025761010e600435602435604435600082815b83811015610120579085900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a90601001610080565b346100025761010e6004356024356044356000805b82811015610129575b6001016100d7565b346100025761010e6004356024356044356000805b82811015610129575b6010016100fd565b60408051918252519081900360200190f35b50949350505050565b5091939250505056",
+            "data": "0x3392ffc8000000000000000000000000000000000000000000000000ffffffffffffffff0000000000000000000000000000000000000000000000005851f42d4c957f2d00000000000000000000000000000000000000000000000000000000000186a0",
+            "gas": "0xe8d4a51000",
+            "gasPrice": "0x5af3107a4000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "0x00"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "nonce": "0x00",
+                "storage": {}
+            }
+        },
+        "expectOut": "0xa0b60baf8a7d5ff1840537484b793d86f808935d77dbab805851f42d4c957f2d",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "0x152d02c7e14af6800000",
+                "code": "0x606060405260e060020a60003504633392ffc8811461003f5780633c77b95c1461006a578063ce67bda6146100c2578063ebbbe00b146100e8575b610002565b346100025761010e600435602435604435600082815b83811015610120579085900a90600101610055565b346100025761010e600435602435604435600082815b83811015610120579085900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a90601001610080565b346100025761010e6004356024356044356000805b82811015610129575b6001016100d7565b346100025761010e6004356024356044356000805b82811015610129575b6010016100fd565b60408051918252519081900360200190f35b50949350505050565b5091939250505056",
+                "nonce": "0x00",
+                "storage": {}
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmPerformance/loop-exp-nop-1MFiller.json b/src/VMTestsFiller/vmPerformance/loop-exp-nop-1MFiller.json
index 1a89ea264..6fabdde45 100644
--- a/src/VMTestsFiller/vmPerformance/loop-exp-nop-1MFiller.json
+++ b/src/VMTestsFiller/vmPerformance/loop-exp-nop-1MFiller.json
@@ -1,39 +1,37 @@
 {
-    "loop-exp-nop-1M" : {
-         "//" : "loop-exp.sol: ExpPerformanceTester.testNop(0, 15, 1000000)",
-         "env" : {
-             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-             "currentDifficulty" : "0x4e20",
-             "currentGasLimit" : "0x174876e800",
-             "currentNumber" : "0x270f",
-             "currentTimestamp" : "0x01"
-         },
-         "exec" : {
-             "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-             "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-             "code" : "0x606060405260e060020a60003504633392ffc8811461003f5780633c77b95c1461006a578063ce67bda6146100c2578063ebbbe00b146100e8575b610002565b346100025761010e600435602435604435600082815b83811015610120579085900a90600101610055565b346100025761010e600435602435604435600082815b83811015610120579085900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a90601001610080565b346100025761010e6004356024356044356000805b82811015610129575b6001016100d7565b346100025761010e6004356024356044356000805b82811015610129575b6010016100fd565b60408051918252519081900360200190f35b50949350505050565b5091939250505056",
-             "data" : "0xce67bda60000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f00000000000000000000000000000000000000000000000000000000000f4240",
-             "gas" : "0xe8d4a51000",
-             "gasPrice" : "0x5af3107a4000",
-             "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-             "value" : "0x00"
-         },
-         "expectOut" : "0x000000000000000000000000000000000000000000000000000000000000000f",
-         "expect" : {
-             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                 "nonce" : "0x00",
-                 "storage" : {
-                 }
-             }
-         },
-         "pre" : {
-             "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                 "balance" : "0x152d02c7e14af6800000",
-                 "code" : "0x606060405260e060020a60003504633392ffc8811461003f5780633c77b95c1461006a578063ce67bda6146100c2578063ebbbe00b146100e8575b610002565b346100025761010e600435602435604435600082815b83811015610120579085900a90600101610055565b346100025761010e600435602435604435600082815b83811015610120579085900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a90601001610080565b346100025761010e6004356024356044356000805b82811015610129575b6001016100d7565b346100025761010e6004356024356044356000805b82811015610129575b6010016100fd565b60408051918252519081900360200190f35b50949350505050565b5091939250505056",
-                 "nonce" : "0x00",
-                 "storage" : {
-                 }
-             }
-         }
-     }
-}
+    "loop-exp-nop-1M": {
+        "//": "loop-exp.sol: ExpPerformanceTester.testNop(0, 15, 1000000)",
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "0x4e20",
+            "currentGasLimit": "0x174876e800",
+            "currentNumber": "0x270f",
+            "currentTimestamp": "0x01"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "code": "0x606060405260e060020a60003504633392ffc8811461003f5780633c77b95c1461006a578063ce67bda6146100c2578063ebbbe00b146100e8575b610002565b346100025761010e600435602435604435600082815b83811015610120579085900a90600101610055565b346100025761010e600435602435604435600082815b83811015610120579085900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a90601001610080565b346100025761010e6004356024356044356000805b82811015610129575b6001016100d7565b346100025761010e6004356024356044356000805b82811015610129575b6010016100fd565b60408051918252519081900360200190f35b50949350505050565b5091939250505056",
+            "data": "0xce67bda60000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f00000000000000000000000000000000000000000000000000000000000f4240",
+            "gas": "0xe8d4a51000",
+            "gasPrice": "0x5af3107a4000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "0x00"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "nonce": "0x00",
+                "storage": {}
+            }
+        },
+        "expectOut": "0x000000000000000000000000000000000000000000000000000000000000000f",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "0x152d02c7e14af6800000",
+                "code": "0x606060405260e060020a60003504633392ffc8811461003f5780633c77b95c1461006a578063ce67bda6146100c2578063ebbbe00b146100e8575b610002565b346100025761010e600435602435604435600082815b83811015610120579085900a90600101610055565b346100025761010e600435602435604435600082815b83811015610120579085900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a85900a90601001610080565b346100025761010e6004356024356044356000805b82811015610129575b6001016100d7565b346100025761010e6004356024356044356000805b82811015610129575b6010016100fd565b60408051918252519081900360200190f35b50949350505050565b5091939250505056",
+                "nonce": "0x00",
+                "storage": {}
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmPerformance/loop-mulFiller.json b/src/VMTestsFiller/vmPerformance/loop-mulFiller.json
index 2ece4f4a1..f41b1f24d 100644
--- a/src/VMTestsFiller/vmPerformance/loop-mulFiller.json
+++ b/src/VMTestsFiller/vmPerformance/loop-mulFiller.json
@@ -1,29 +1,29 @@
 {
     "loop-mul": {
-        "env" : {
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-            "currentNumber" : "9999",
-            "currentGasLimit" : "100000000000",
-            "currentDifficulty" : "20000",
-            "currentTimestamp" : "1",
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "20000",
+            "currentGasLimit": "100000000000",
+            "currentNumber": "9999",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x606060405260e060020a6000350463eb8ac9218114601c575b6002565b3460025760646004356024356000675851f42d4c957f2d6714057b7ef767814f82805b600086146076575050938102840180820285018082029560001995909501949190603f565b60408051918252519081900360200190f35b50949594505050505056",
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "0xeb8ac9215eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeed0000000000000000000000000000000000000000000000000000000000100000",
+            "gas": "1000000000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "0"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x606060405260e060020a6000350463eb8ac9218114601c575b6002565b3460025760646004356024356000675851f42d4c957f2d6714057b7ef767814f82805b600086146076575050938102840180820285018082029560001995909501949190603f565b60408051918252519081900360200190f35b50949594505050505056",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "0",
-            "data" : "0xeb8ac9215eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeed0000000000000000000000000000000000000000000000000000000000100000",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmPerformance/loop-mulmod-2MFiller.json b/src/VMTestsFiller/vmPerformance/loop-mulmod-2MFiller.json
index 899fa6a68..e1bc59022 100644
--- a/src/VMTestsFiller/vmPerformance/loop-mulmod-2MFiller.json
+++ b/src/VMTestsFiller/vmPerformance/loop-mulmod-2MFiller.json
@@ -1,30 +1,30 @@
 {
     "loop-mulmod-2M": {
-        "//" : "loop-mul.sol: MulPerformanceTester.testMulMod(..., ..., 2^256-1, 2000000)",
-        "env" : {
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-            "currentNumber" : "9999",
-            "currentGasLimit" : "100000000000",
-            "currentDifficulty" : "20000",
-            "currentTimestamp" : "1",
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "//": "loop-mul.sol: MulPerformanceTester.testMulMod(..., ..., 2^256-1, 2000000)",
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "20000",
+            "currentGasLimit": "100000000000",
+            "currentNumber": "9999",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x606060405263ffffffff60e060020a60003504166315d4232781146022575b6000565b346000576038600435602435604435606435604a565b60408051918252519081900360200190f35b600084815b838110156064578486830991505b600101604f565b8192505b50509493505050505600a165627a7a723058200b2f52fbc8327bac47da1762338f70ad17310de956a58bbbca8ee58378f357900029",
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "0x15d423278edad8b55b1586805ea8c245d8c16b06a5102b791fc6eb60693731c0677bf5011c68db1c179cd35ab3fc60c63704aa7fcbea40f19782b1611aaba86726a7686cffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000001e8480",
+            "gas": "1000000000000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "0"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x606060405263ffffffff60e060020a60003504166315d4232781146022575b6000565b346000576038600435602435604435606435604a565b60408051918252519081900360200190f35b600084815b838110156064578486830991505b600101604f565b8192505b50509493505050505600a165627a7a723058200b2f52fbc8327bac47da1762338f70ad17310de956a58bbbca8ee58378f357900029",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "0",
-            "data" : "0x15d423278edad8b55b1586805ea8c245d8c16b06a5102b791fc6eb60693731c0677bf5011c68db1c179cd35ab3fc60c63704aa7fcbea40f19782b1611aaba86726a7686cffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00000000000000000000000000000000000000000000000000000000001e8480",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000000000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmPerformance/manyFunctions100Filler.json b/src/VMTestsFiller/vmPerformance/manyFunctions100Filler.json
index 1ba5e6b80..76fbbe3ef 100644
--- a/src/VMTestsFiller/vmPerformance/manyFunctions100Filler.json
+++ b/src/VMTestsFiller/vmPerformance/manyFunctions100Filler.json
@@ -1,31 +1,31 @@
 {
     "manyFunctions100": {
-        "env" : {
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-            "currentNumber" : "0",
-            "currentGasLimit" : "100000000000",
-            "currentDifficulty" : "256",
-            "currentTimestamp" : "1",
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "100000000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "//" : "ManyFunctions.sol",
-                "code" : "0x60e060020a60003504806301f99ad7146108c3578063023a624a146108d857806303bdecf5146108ed57806305fe035f14610902578063082d8f4914610917578063090bf3b71461092c5780630bd9c534146109415780630c4bfa94146109565780630e20ebe21461096b5780630f76de0d1461098057806310cfcc191461099557806313ce15a9146109aa578063140dcec4146109bf57806314d07a3e146109d45780631687f112146109e957806316eb6603146109fe578063172cf71714610a135780631bd6f59614610a285780631cdb857114610a3d5780631cf74ece14610a525780631d09ba2c14610a675780631f69aa5114610a7c578063223dcc7414610a9157806325e524d314610aa6578063261de7c414610abb5780632632924d14610ad05780632909cc5d14610ae55780632981699814610afa5780632a85a45d14610b0f5780632ca36da014610b245780632cbf1f0d14610b395780632d0f557314610b4e5780632d97867814610b6357806331db9efd14610b7857806332064db714610b8d57806332931fbb14610ba2578063355f51a014610bb7578063361bb34014610bcc578063364ddb0e14610be15780633792a01814610bf657806338c68f8f14610c0b57806338e586fd14610c20578063392d42ae14610c3557806339a87bd914610c4a5780633a95a33214610c5f5780633b8ecdf914610c745780633cf0659a14610c895780633eaf992314610c9e5780633fe97ead14610cb35780633ff11c8b14610cc8578063404efc5314610cdd578063407fce7b14610cf257806340c3b18714610d07578063440208c314610d1c57806344e86b2f14610d31578063455df57914610d465780634689ab4d14610d5b57806346be2e0c14610d70578063487cd86f14610d8557806348e6178214610d9a57806349d4a34414610daf5780634a0f597414610dc45780634bc24ec514610dd95780634c2fe45614610dee5780634cc885d414610e035780634eaaad7b14610e185780634eb166af14610e2d5780635050093414610e42578063506bff1114610e57578063508762c114610e6c578063526938f814610e8157806354400c6014610e96578063559510d814610eab57806355a5f70214610ec057806356ca528f14610ed5578063570a2a1614610eea5780635dab2e0f14610eff5780635dca53d314610f1457806362017ebc14610f29578063621a25f814610f3e578063626d4a3614610f5357806362b6a28214610f6857806364faf22c14610f7d57806366d7ffde14610f9257806367b886e814610fa757806367e902c714610fbc57806369d7774014610fd15780636b7ae8e614610fe65780636c3b659114610ffb5780636e54181e146110105780636e978d91146110255780636f63d2ec1461103a578063706332d11461104f57806370ac4bb9146110645780637138ef521461107957806371dd46a91461108e57806372a7c229146110a35780637376fc8d146110b8578063738a2679146110cd57806374552650146110e2578063746fc8d0146110f757806379254bb81461110c5780637adaa3f8146111215780637e4eb35b14611136578063885ec18e1461114b5780638b9ff6b6146111605780638ce113dc146111755780638defbc5e1461118a5780638f4613d51461119f5780638fdc24ba146111b45780639002dba4146111c957806391d15735146111de57806391d43b23146111f357806393b14daa1461120857806394d63afd1461121d57806395805dad1461123257806396f68782146112475780639740e4a21461125c578063981290131461127157806399a3f0e8146112865780639acb1ad41461129b5780639be07908146112b05780639c15be0b146112c55780639d451c4d146112da5780639d8ee943146112ef5780639ef6ca0f14611304578063a0db0a2214611319578063a18e2eb91461132e578063a408384914611343578063a57544da14611358578063a5a83e4d1461136d578063a6843f3414611382578063a6dacdd714611397578063a8c4c8bc146113ac578063aa058a73146113c1578063aad62da2146113d6578063aaf3e4f4146113eb578063ab81e77314611400578063abc93aee14611415578063abde33f71461142a578063b114b96c1461143f578063b3df873714611454578063b4174cb014611469578063b5d02a561461147e578063b731e84814611493578063b7b96723146114a8578063bbcded7a146114bd578063bbececa9146114d2578063beca7440146114e7578063bf8981c0146114fc578063c028c67414611511578063c2385fa614611526578063c319a02c1461153b578063c569bae014611550578063c6715f8114611565578063c7b98dec1461157a578063c9acab841461158f578063ca9efc73146115a4578063cad80024146115b9578063cdadb0fa146115ce578063cdbdf391146115e3578063cf460fa5146115f8578063cf69318a1461160d578063d1835b8c14611622578063d353a1cb14611637578063d3e141e01461164c578063d5ec7e1d14611661578063d7ead1de14611676578063d90b02aa1461168b578063d959e244146116a0578063d9e68b44146116b5578063daacb24f146116ca578063dc12a805146116df578063dd946033146116f4578063dda5142414611709578063de6612171461171e578063dfb9560c14611733578063e03827d214611748578063e21720001461175d578063e2c718d814611772578063e3da539914611787578063e48e603f1461179c578063e5f9ec29146117b1578063e6c0459a146117c6578063e70addec146117db578063e7a01215146117f0578063ea7f4d2714611805578063ebb6c59f1461181a578063ed6302be1461182f578063ed64b36b14611844578063eecd278914611859578063f0ed14e01461186e578063f0f2134414611883578063f1e328f914611898578063f1e6f4cd146118ad578063f32fe995146118c2578063f75165c6146118d7578063f7ed71d0146118ec578063f80f44f314611901578063f8bc050514611916578063fbd3c51a1461192b578063fd72009014611940578063fed3a3001461195557005b6108ce600435612edf565b8060005260206000f35b6108e3600435612fb5565b8060005260206000f35b6108f8600435613f47565b8060005260206000f35b61090d600435612a11565b8060005260206000f35b6109226004356127ec565b8060005260206000f35b61093760043561215c565b8060005260206000f35b61094c6004356128c2565b8060005260206000f35b61096160043561310f565b8060005260206000f35b610976600435614e0b565b8060005260206000f35b61098b600435613269565b8060005260206000f35b6109a0600435611a82565b8060005260206000f35b6109b5600435613e71565b8060005260206000f35b6109ca600435611dd2565b8060005260206000f35b6109df6004356120d0565b8060005260206000f35b6109f4600435613755565b8060005260206000f35b610a096004356134e3565b8060005260206000f35b610a1e6004356137e1565b8060005260206000f35b610a3360043561382b565b8060005260206000f35b610a48600435612b0b565b8060005260206000f35b610a5d60043561386d565b8060005260206000f35b610a726004356131e5565b8060005260206000f35b610a876004356143e9565b8060005260206000f35b610a9c60043561319b565b8060005260206000f35b610ab1600435612e11565b8060005260206000f35b610ac660043561234a565b8060005260206000f35b610adb6004356121e8565b8060005260206000f35b610af06004356119f6565b8060005260206000f35b610b05600435613bff565b8060005260206000f35b610b1a600435612606565b8060005260206000f35b610b2f6004356126d4565b8060005260206000f35b610b44600435613bb5565b8060005260206000f35b610b59600435612462565b8060005260206000f35b610b6e600435611e14565b8060005260206000f35b610b836004356149ab565b8060005260206000f35b610b98600435611c26565b8060005260206000f35b610bad600435612a7f565b8060005260206000f35b610bc2600435613457565b8060005260206000f35b610bd760043561340d565b8060005260206000f35b610bec60043561363d565b8060005260206000f35b610c01600435612e53565b8060005260206000f35b610c1660043561477b565b8060005260206000f35b610c2b600435612c6d565b8060005260206000f35b610c40600435612648565b8060005260206000f35b610c55600435612274565b8060005260206000f35b610c6a6004356138f9565b8060005260206000f35b610c7f600435612b55565b8060005260206000f35b610c94600435611eea565b8060005260206000f35b610ca9600435613ebb565b8060005260206000f35b610cbe600435613499565b8060005260206000f35b610cd3600435614807565b8060005260206000f35b610ce8600435611fb8565b8060005260206000f35b610cfd600435613083565b8060005260206000f35b610d126004356125bc565b8060005260206000f35b610d27600435613041565b8060005260206000f35b610d3c6004356140a1565b8060005260206000f35b610d516004356147bd565b8060005260206000f35b610d66600435611c70565b8060005260206000f35b610d7b600435612300565b8060005260206000f35b610d906004356123d6565b8060005260206000f35b610da5600435612c23565b8060005260206000f35b610dba600435614faf565b8060005260206000f35b610dcf600435612044565b8060005260206000f35b610de4600435613ae7565b8060005260206000f35b610df9600435614cf3565b8060005260206000f35b610e0e600435613d17565b8060005260206000f35b610e2360043561412d565b8060005260206000f35b610e38600435614177565b8060005260206000f35b610e4d60043561208e565b8060005260206000f35b610e62600435612dc7565b8060005260206000f35b610e77600435612f29565b8060005260206000f35b610e8c6004356124a4565b8060005260206000f35b610ea1600435611b58565b8060005260206000f35b610eb66004356136c9565b8060005260206000f35b610ecb600435613227565b8060005260206000f35b610ee0600435611acc565b8060005260206000f35b610ef5600435613687565b8060005260206000f35b610f0a6004356146a5565b8060005260206000f35b610f1f6004356121a6565b8060005260206000f35b610f346004356132f5565b8060005260206000f35b610f49600435613da3565b8060005260206000f35b610f5e60043561379f565b8060005260206000f35b610f73600435612878565b8060005260206000f35b610f88600435611b0e565b8060005260206000f35b610f9d600435611ea0565b8060005260206000f35b610fb2600435614ed9565b8060005260206000f35b610fc7600435614bdb565b8060005260206000f35b610fdc600435614c1d565b8060005260206000f35b610ff1600435614245565b8060005260206000f35b6110066004356146ef565b8060005260206000f35b61101b60043561428f565b8060005260206000f35b611030600435614ac3565b8060005260206000f35b611045600435613de5565b8060005260206000f35b61105a6004356132b3565b8060005260206000f35b61106f6004356122be565b8060005260206000f35b611084600435612e9d565b8060005260206000f35b611099600435611b9a565b8060005260206000f35b6110ae6004356127aa565b8060005260206000f35b6110c3600435613e2f565b8060005260206000f35b6110d8600435614849565b8060005260206000f35b6110ed600435614dc1565b8060005260206000f35b61110260043561333f565b8060005260206000f35b61111760043561211a565b8060005260206000f35b61112c600435612692565b8060005260206000f35b611141600435612904565b8060005260206000f35b611156600435612d3b565b8060005260206000f35b61116b600435614b91565b8060005260206000f35b611180600435613a5b565b8060005260206000f35b611195600435612232565b8060005260206000f35b6111aa600435612f6b565b8060005260206000f35b6111bf600435614d35565b8060005260206000f35b6111d4600435611a40565b8060005260206000f35b6111e9600435612ff7565b8060005260206000f35b6111fe60043561431b565b8060005260206000f35b611213600435613159565b8060005260206000f35b611228600435612b97565b8060005260206000f35b61123d600435612990565b8060005260206000f35b611252600435613b73565b8060005260206000f35b611267600435614961565b8060005260206000f35b61127c600435613381565b8060005260206000f35b611291600435613fd3565b8060005260206000f35b6112a660043561257a565b8060005260206000f35b6112bb600435614501565b8060005260206000f35b6112d0600435613d59565b8060005260206000f35b6112e56004356143a7565b8060005260206000f35b6112fa60043561405f565b8060005260206000f35b61130f60043561238c565b8060005260206000f35b611324600435612be1565b8060005260206000f35b611339600435613f89565b8060005260206000f35b61134e60043561294e565b8060005260206000f35b6113636004356124ee565b8060005260206000f35b611378600435614b4f565b8060005260206000f35b61138d6004356133cb565b8060005260206000f35b6113a26004356139cf565b8060005260206000f35b6113b7600435613c8b565b8060005260206000f35b6113cc600435612cf9565b8060005260206000f35b6113e1600435614a79565b8060005260206000f35b6113f66004356149ed565b8060005260206000f35b61140b600435613b29565b8060005260206000f35b611420600435613ccd565b8060005260206000f35b611435600435611f76565b8060005260206000f35b61144a600435614ff1565b8060005260206000f35b61145f600435613525565b8060005260206000f35b61147460043561356f565b8060005260206000f35b6114896004356129dc565b8060005260206000f35b61149e600435614ca9565b8060005260206000f35b6114b3600435612d85565b8060005260206000f35b6114c86004356141b9565b8060005260206000f35b6114dd600435614475565b8060005260206000f35b6114f26004356135fb565b8060005260206000f35b611507600435612530565b8060005260206000f35b61151c600435614663565b8060005260206000f35b611531600435614433565b8060005260206000f35b611546600435614f23565b8060005260206000f35b61155b600435614c67565b8060005260206000f35b611570600435611d3e565b8060005260206000f35b611585600435612a3d565b8060005260206000f35b61159a600435613a11565b8060005260206000f35b6115af600435614619565b8060005260206000f35b6115c4600435613985565b8060005260206000f35b6115d9600435613943565b8060005260206000f35b6115ee600435612418565b8060005260206000f35b6116036004356119b4565b8060005260206000f35b611618600435613a9d565b8060005260206000f35b61162d600435611cb2565b8060005260206000f35b6116426004356129d2565b8060005260206000f35b611657600435612caf565b8060005260206000f35b61166c600435611d88565b8060005260206000f35b611681600435614203565b8060005260206000f35b61169660043561458d565b8060005260206000f35b6116ab600435611f2c565b8060005260206000f35b6116c0600435612a23565b8060005260206000f35b6116d5600435612836565b8060005260206000f35b6116ea6004356138b7565b8060005260206000f35b6116ff6004356145d7565b8060005260206000f35b61171460043561454b565b8060005260206000f35b6117296004356142d1565b8060005260206000f35b61173e600435611e5e565b8060005260206000f35b611753600435614015565b8060005260206000f35b611768600435613c41565b8060005260206000f35b61177d600435611be4565b8060005260206000f35b611792600435614b05565b8060005260206000f35b6117a7600435613713565b8060005260206000f35b6117bc6004356135b1565b8060005260206000f35b6117d16004356144bf565b8060005260206000f35b6117e660043561491f565b8060005260206000f35b6117fb600435612ac9565b8060005260206000f35b6118106004356130cd565b8060005260206000f35b6118256004356140eb565b8060005260206000f35b61183a600435614f65565b8060005260206000f35b61184f60043561196a565b8060005260206000f35b6118646004356148d5565b8060005260206000f35b611879600435614d7f565b8060005260206000f35b61188e600435612002565b8060005260206000f35b6118a3600435613efd565b8060005260206000f35b6118b860043561271e565b8060005260206000f35b6118cd600435614e4d565b8060005260206000f35b6118e2600435611cfc565b8060005260206000f35b6118f7600435612760565b8060005260206000f35b61190c600435614e97565b8060005260206000f35b61192160043561435d565b8060005260206000f35b611936600435614731565b8060005260206000f35b61194b600435614893565b8060005260206000f35b611960600435614a37565b8060005260206000f35b6000600061197f61197a846129dc565b6129dc565b9050605d60020a811015611992576119a2565b61199b816119f6565b91506119ae565b6119ab816119b4565b91505b50919050565b600060006119c1836129dc565b9050605e60020a8110156119d4576119e4565b6119dd81611a40565b91506119f0565b6119ed81611a82565b91505b50919050565b60006000611a0b611a06846129dc565b6129dc565b9050605e60020a811015611a1e57611a2e565b611a2781611a82565b9150611a3a565b611a3781611a40565b91505b50919050565b60006000611a4d836129dc565b9050605f60020a811015611a6057611a70565b611a6981611acc565b9150611a7c565b611a7981611b0e565b91505b50919050565b60006000611a97611a92846129dc565b6129dc565b9050605f60020a811015611aaa57611aba565b611ab381611b0e565b9150611ac6565b611ac381611acc565b91505b50919050565b60006000611ad9836129dc565b9050606060020a811015611aec57611afc565b611af581611b58565b9150611b08565b611b0581611b9a565b91505b50919050565b60006000611b23611b1e846129dc565b6129dc565b9050606060020a811015611b3657611b46565b611b3f81611b9a565b9150611b52565b611b4f81611b58565b91505b50919050565b60006000611b65836129dc565b9050606160020a811015611b7857611b88565b611b8181611be4565b9150611b94565b611b9181611c26565b91505b50919050565b60006000611baf611baa846129dc565b6129dc565b9050606160020a811015611bc257611bd2565b611bcb81611c26565b9150611bde565b611bdb81611be4565b91505b50919050565b60006000611bf1836129dc565b9050606260020a811015611c0457611c14565b611c0d81611c70565b9150611c20565b611c1d81611cb2565b91505b50919050565b60006000611c3b611c36846129dc565b6129dc565b9050606260020a811015611c4e57611c5e565b611c5781611cb2565b9150611c6a565b611c6781611c70565b91505b50919050565b60006000611c7d836129dc565b9050606360020a811015611c9057611ca0565b611c9981611cfc565b9150611cac565b611ca981611d88565b91505b50919050565b60006000611cc7611cc2846129dc565b6129dc565b9050606360020a811015611cda57611cea565b611ce381611d88565b9150611cf6565b611cf381611cfc565b91505b50919050565b60006000611d09836129dc565b9050606460020a811015611d1c57611d2c565b611d2581611dd2565b9150611d38565b611d3581611e14565b91505b50919050565b60006000611d53611d4e846129dc565b6129dc565b9050607a60020a811015611d6657611d76565b611d6f81613269565b9150611d82565b611d7f81613227565b91505b50919050565b60006000611d9d611d98846129dc565b6129dc565b9050606460020a811015611db057611dc0565b611db981611e14565b9150611dcc565b611dc981611dd2565b91505b50919050565b60006000611ddf836129dc565b9050606560020a811015611df257611e02565b611dfb81611e5e565b9150611e0e565b611e0b81611ea0565b91505b50919050565b60006000611e29611e24846129dc565b6129dc565b9050606560020a811015611e3c57611e4c565b611e4581611ea0565b9150611e58565b611e5581611e5e565b91505b50919050565b60006000611e6b836129dc565b9050606660020a811015611e7e57611e8e565b611e8781611eea565b9150611e9a565b611e9781611f2c565b91505b50919050565b60006000611eb5611eb0846129dc565b6129dc565b9050606660020a811015611ec857611ed8565b611ed181611f2c565b9150611ee4565b611ee181611eea565b91505b50919050565b60006000611ef7836129dc565b9050606760020a811015611f0a57611f1a565b611f1381611f76565b9150611f26565b611f2381611fb8565b91505b50919050565b60006000611f41611f3c846129dc565b6129dc565b9050606760020a811015611f5457611f64565b611f5d81611fb8565b9150611f70565b611f6d81611f76565b91505b50919050565b60006000611f83836129dc565b9050606860020a811015611f9657611fa6565b611f9f81612002565b9150611fb2565b611faf81612044565b91505b50919050565b60006000611fcd611fc8846129dc565b6129dc565b9050606860020a811015611fe057611ff0565b611fe981612044565b9150611ffc565b611ff981612002565b91505b50919050565b6000600061200f836129dc565b9050606960020a81101561202257612032565b61202b8161208e565b915061203e565b61203b816120d0565b91505b50919050565b60006000612059612054846129dc565b6129dc565b9050606960020a81101561206c5761207c565b612075816120d0565b9150612088565b6120858161208e565b91505b50919050565b6000600061209b836129dc565b9050606a60020a8110156120ae576120be565b6120b78161211a565b91506120ca565b6120c78161215c565b91505b50919050565b600060006120e56120e0846129dc565b6129dc565b9050606a60020a8110156120f857612108565b6121018161215c565b9150612114565b6121118161211a565b91505b50919050565b60006000612127836129dc565b9050606b60020a81101561213a5761214a565b612143816121a6565b9150612156565b612153816121e8565b91505b50919050565b6000600061217161216c846129dc565b6129dc565b9050606b60020a81101561218457612194565b61218d816121e8565b91506121a0565b61219d816121a6565b91505b50919050565b600060006121b3836129dc565b9050606c60020a8110156121c6576121d6565b6121cf81612232565b91506121e2565b6121df81612274565b91505b50919050565b600060006121fd6121f8846129dc565b6129dc565b9050606c60020a81101561221057612220565b61221981612274565b915061222c565b61222981612232565b91505b50919050565b6000600061223f836129dc565b9050606d60020a81101561225257612262565b61225b816122be565b915061226e565b61226b81612300565b91505b50919050565b60006000612289612284846129dc565b6129dc565b9050606d60020a81101561229c576122ac565b6122a581612300565b91506122b8565b6122b5816122be565b91505b50919050565b600060006122cb836129dc565b9050606e60020a8110156122de576122ee565b6122e78161234a565b91506122fa565b6122f78161238c565b91505b50919050565b60006000612315612310846129dc565b6129dc565b9050606e60020a81101561232857612338565b6123318161238c565b9150612344565b6123418161234a565b91505b50919050565b60006000612357836129dc565b9050606f60020a81101561236a5761237a565b612373816123d6565b9150612386565b61238381612418565b91505b50919050565b600060006123a161239c846129dc565b6129dc565b9050606f60020a8110156123b4576123c4565b6123bd81612418565b91506123d0565b6123cd816123d6565b91505b50919050565b600060006123e3836129dc565b9050607060020a8110156123f657612406565b6123ff81612462565b9150612412565b61240f816124a4565b91505b50919050565b6000600061242d612428846129dc565b6129dc565b9050607060020a81101561244057612450565b612449816124a4565b915061245c565b61245981612462565b91505b50919050565b6000600061246f836129dc565b9050607160020a81101561248257612492565b61248b816124ee565b915061249e565b61249b81612530565b91505b50919050565b600060006124b96124b4846129dc565b6129dc565b9050607160020a8110156124cc576124dc565b6124d581612530565b91506124e8565b6124e5816124ee565b91505b50919050565b600060006124fb836129dc565b9050607260020a81101561250e5761251e565b6125178161257a565b915061252a565b612527816125bc565b91505b50919050565b60006000612545612540846129dc565b6129dc565b9050607260020a81101561255857612568565b612561816125bc565b9150612574565b6125718161257a565b91505b50919050565b60006000612587836129dc565b9050607360020a81101561259a576125aa565b6125a381612606565b91506125b6565b6125b381612648565b91505b50919050565b600060006125d16125cc846129dc565b6129dc565b9050607360020a8110156125e4576125f4565b6125ed81612648565b9150612600565b6125fd81612606565b91505b50919050565b60006000612613836129dc565b9050607460020a81101561262657612636565b61262f81612692565b9150612642565b61263f816126d4565b91505b50919050565b6000600061265d612658846129dc565b6129dc565b9050607460020a81101561267057612680565b612679816126d4565b915061268c565b61268981612692565b91505b50919050565b6000600061269f836129dc565b9050607560020a8110156126b2576126c2565b6126bb8161271e565b91506126ce565b6126cb81612760565b91505b50919050565b600060006126e96126e4846129dc565b6129dc565b9050607560020a8110156126fc5761270c565b61270581612760565b9150612718565b6127158161271e565b91505b50919050565b6000600061272b836129dc565b9050607660020a81101561273e5761274e565b612747816127aa565b915061275a565b612757816127ec565b91505b50919050565b60006000612775612770846129dc565b6129dc565b9050607660020a81101561278857612798565b612791816127ec565b91506127a4565b6127a1816127aa565b91505b50919050565b600060006127b7836129dc565b9050607760020a8110156127ca576127da565b6127d381612836565b91506127e6565b6127e381612878565b91505b50919050565b600060006128016127fc846129dc565b6129dc565b9050607760020a81101561281457612824565b61281d81612878565b9150612830565b61282d81612836565b91505b50919050565b60006000612843836129dc565b9050607860020a81101561285657612866565b61285f816128c2565b9150612872565b61286f81612904565b91505b50919050565b6000600061288d612888846129dc565b6129dc565b9050607860020a8110156128a0576128b0565b6128a981612904565b91506128bc565b6128b9816128c2565b91505b50919050565b600060006128cf836129dc565b9050607960020a8110156128e2576128f2565b6128eb8161294e565b91506128fe565b6128fb81611d3e565b91505b50919050565b60006000612919612914846129dc565b6129dc565b9050607960020a81101561292c5761293c565b61293581611d3e565b9150612948565b6129458161294e565b91505b50919050565b6000600061295b836129dc565b9050607a60020a81101561296e5761297e565b61297781613227565b915061298a565b61298781613269565b91505b50919050565b6000600061299d836129dc565b9050604e60020a8110156129b0576129c0565b6129b981612a7f565b91506129cc565b6129c981612a3d565b91505b50919050565b6000819050919050565b600060007f5851f42d4c957f2c0000000000000000000000000000000000000000000000019050828102600101915050919050565b6000612a1c826129d2565b9050919050565b6000612a36612a31836129dc565b6129d2565b9050919050565b60006000612a4a836129dc565b9050604f60020a811015612a5d57612a6d565b612a6681612ac9565b9150612a79565b612a7681612b0b565b91505b50919050565b60006000612a94612a8f846129dc565b6129dc565b9050604f60020a811015612aa757612ab7565b612ab081612b0b565b9150612ac3565b612ac081612ac9565b91505b50919050565b60006000612ad6836129dc565b9050605060020a811015612ae957612af9565b612af281612b55565b9150612b05565b612b0281612b97565b91505b50919050565b60006000612b20612b1b846129dc565b6129dc565b9050605060020a811015612b3357612b43565b612b3c81612b97565b9150612b4f565b612b4c81612b55565b91505b50919050565b60006000612b62836129dc565b9050605160020a811015612b7557612b85565b612b7e81612be1565b9150612b91565b612b8e81612c23565b91505b50919050565b60006000612bac612ba7846129dc565b6129dc565b9050605160020a811015612bbf57612bcf565b612bc881612c23565b9150612bdb565b612bd881612be1565b91505b50919050565b60006000612bee836129dc565b9050605260020a811015612c0157612c11565b612c0a81612c6d565b9150612c1d565b612c1a81612caf565b91505b50919050565b60006000612c38612c33846129dc565b6129dc565b9050605260020a811015612c4b57612c5b565b612c5481612caf565b9150612c67565b612c6481612c6d565b91505b50919050565b60006000612c7a836129dc565b9050605360020a811015612c8d57612c9d565b612c9681612cf9565b9150612ca9565b612ca681612d3b565b91505b50919050565b60006000612cc4612cbf846129dc565b6129dc565b9050605360020a811015612cd757612ce7565b612ce081612d3b565b9150612cf3565b612cf081612cf9565b91505b50919050565b60006000612d06836129dc565b9050605460020a811015612d1957612d29565b612d2281612d85565b9150612d35565b612d3281612dc7565b91505b50919050565b60006000612d50612d4b846129dc565b6129dc565b9050605460020a811015612d6357612d73565b612d6c81612dc7565b9150612d7f565b612d7c81612d85565b91505b50919050565b60006000612d92836129dc565b9050605560020a811015612da557612db5565b612dae81612e11565b9150612dc1565b612dbe81612e53565b91505b50919050565b60006000612ddc612dd7846129dc565b6129dc565b9050605560020a811015612def57612dff565b612df881612e53565b9150612e0b565b612e0881612e11565b91505b50919050565b60006000612e1e836129dc565b9050605660020a811015612e3157612e41565b612e3a81612e9d565b9150612e4d565b612e4a81612edf565b91505b50919050565b60006000612e68612e63846129dc565b6129dc565b9050605660020a811015612e7b57612e8b565b612e8481612edf565b9150612e97565b612e9481612e9d565b91505b50919050565b60006000612eaa836129dc565b9050605760020a811015612ebd57612ecd565b612ec681612f29565b9150612ed9565b612ed681612f6b565b91505b50919050565b60006000612ef4612eef846129dc565b6129dc565b9050605760020a811015612f0757612f17565b612f1081612f6b565b9150612f23565b612f2081612f29565b91505b50919050565b60006000612f36836129dc565b9050605860020a811015612f4957612f59565b612f5281612fb5565b9150612f65565b612f6281612ff7565b91505b50919050565b60006000612f80612f7b846129dc565b6129dc565b9050605860020a811015612f9357612fa3565b612f9c81612ff7565b9150612faf565b612fac81612fb5565b91505b50919050565b60006000612fc2836129dc565b9050605960020a811015612fd557612fe5565b612fde81613041565b9150612ff1565b612fee81613083565b91505b50919050565b6000600061300c613007846129dc565b6129dc565b9050605960020a81101561301f5761302f565b61302881613083565b915061303b565b61303881613041565b91505b50919050565b6000600061304e836129dc565b9050605a60020a81101561306157613071565b61306a816130cd565b915061307d565b61307a8161310f565b91505b50919050565b60006000613098613093846129dc565b6129dc565b9050605a60020a8110156130ab576130bb565b6130b48161310f565b91506130c7565b6130c4816130cd565b91505b50919050565b600060006130da836129dc565b9050605b60020a8110156130ed576130fd565b6130f681613159565b9150613109565b6131068161319b565b91505b50919050565b6000600061312461311f846129dc565b6129dc565b9050605b60020a81101561313757613147565b6131408161319b565b9150613153565b61315081613159565b91505b50919050565b60006000613166836129dc565b9050605c60020a81101561317957613189565b613182816131e5565b9150613195565b6131928161196a565b91505b50919050565b600060006131b06131ab846129dc565b6129dc565b9050605c60020a8110156131c3576131d3565b6131cc8161196a565b91506131df565b6131dc816131e5565b91505b50919050565b600060006131f2836129dc565b9050605d60020a81101561320557613215565b61320e816119b4565b9150613221565b61321e816119f6565b91505b50919050565b60006000613234836129dc565b9050607b60020a81101561324757613257565b613250816132b3565b9150613263565b613260816132f5565b91505b50919050565b6000600061327e613279846129dc565b6129dc565b9050607b60020a811015613291576132a1565b61329a816132f5565b91506132ad565b6132aa816132b3565b91505b50919050565b600060006132c0836129dc565b9050607c60020a8110156132d3576132e3565b6132dc8161333f565b91506132ef565b6132ec81613381565b91505b50919050565b6000600061330a613305846129dc565b6129dc565b9050607c60020a81101561331d5761332d565b61332681613381565b9150613339565b6133368161333f565b91505b50919050565b6000600061334c836129dc565b9050607d60020a81101561335f5761336f565b613368816133cb565b915061337b565b6133788161340d565b91505b50919050565b60006000613396613391846129dc565b6129dc565b9050607d60020a8110156133a9576133b9565b6133b28161340d565b91506133c5565b6133c2816133cb565b91505b50919050565b600060006133d8836129dc565b9050607e60020a8110156133eb576133fb565b6133f481613457565b9150613407565b61340481613499565b91505b50919050565b6000600061342261341d846129dc565b6129dc565b9050607e60020a81101561343557613445565b61343e81613499565b9150613451565b61344e81613457565b91505b50919050565b60006000613464836129dc565b9050607f60020a81101561347757613487565b613480816134e3565b9150613493565b61349081613525565b91505b50919050565b600060006134ae6134a9846129dc565b6129dc565b9050607f60020a8110156134c1576134d1565b6134ca81613525565b91506134dd565b6134da816134e3565b91505b50919050565b600060006134f0836129dc565b9050608060020a81101561350357613513565b61350c8161356f565b915061351f565b61351c816135b1565b91505b50919050565b6000600061353a613535846129dc565b6129dc565b9050608060020a81101561354d5761355d565b613556816135b1565b9150613569565b6135668161356f565b91505b50919050565b6000600061357c836129dc565b9050608160020a81101561358f5761359f565b613598816135fb565b91506135ab565b6135a88161363d565b91505b50919050565b600060006135c66135c1846129dc565b6129dc565b9050608160020a8110156135d9576135e9565b6135e28161363d565b91506135f5565b6135f2816135fb565b91505b50919050565b60006000613608836129dc565b9050608260020a81101561361b5761362b565b61362481613687565b9150613637565b613634816136c9565b91505b50919050565b6000600061365261364d846129dc565b6129dc565b9050608260020a81101561366557613675565b61366e816136c9565b9150613681565b61367e81613687565b91505b50919050565b60006000613694836129dc565b9050608360020a8110156136a7576136b7565b6136b081613713565b91506136c3565b6136c081613755565b91505b50919050565b600060006136de6136d9846129dc565b6129dc565b9050608360020a8110156136f157613701565b6136fa81613755565b915061370d565b61370a81613713565b91505b50919050565b60006000613720836129dc565b9050608460020a81101561373357613743565b61373c8161379f565b915061374f565b61374c816137e1565b91505b50919050565b6000600061376a613765846129dc565b6129dc565b9050608460020a81101561377d5761378d565b613786816137e1565b9150613799565b6137968161379f565b91505b50919050565b600060006137ac836129dc565b9050608560020a8110156137bf576137cf565b6137c88161382b565b91506137db565b6137d88161386d565b91505b50919050565b600060006137f66137f1846129dc565b6129dc565b9050608560020a81101561380957613819565b6138128161386d565b9150613825565b6138228161382b565b91505b50919050565b60006000613838836129dc565b9050608660020a81101561384b5761385b565b613854816138b7565b9150613867565b613864816138f9565b91505b50919050565b6000600061388261387d846129dc565b6129dc565b9050608660020a811015613895576138a5565b61389e816138f9565b91506138b1565b6138ae816138b7565b91505b50919050565b600060006138c4836129dc565b9050608760020a8110156138d7576138e7565b6138e081613943565b91506138f3565b6138f081613985565b91505b50919050565b6000600061390e613909846129dc565b6129dc565b9050608760020a81101561392157613931565b61392a81613985565b915061393d565b61393a81613943565b91505b50919050565b60006000613950836129dc565b9050608860020a81101561396357613973565b61396c816139cf565b915061397f565b61397c81613a11565b91505b50919050565b6000600061399a613995846129dc565b6129dc565b9050608860020a8110156139ad576139bd565b6139b681613a11565b91506139c9565b6139c6816139cf565b91505b50919050565b600060006139dc836129dc565b9050608960020a8110156139ef576139ff565b6139f881613a5b565b9150613a0b565b613a0881613a9d565b91505b50919050565b60006000613a26613a21846129dc565b6129dc565b9050608960020a811015613a3957613a49565b613a4281613a9d565b9150613a55565b613a5281613a5b565b91505b50919050565b60006000613a68836129dc565b9050608a60020a811015613a7b57613a8b565b613a8481613ae7565b9150613a97565b613a9481613b29565b91505b50919050565b60006000613ab2613aad846129dc565b6129dc565b9050608a60020a811015613ac557613ad5565b613ace81613b29565b9150613ae1565b613ade81613ae7565b91505b50919050565b60006000613af4836129dc565b9050608b60020a811015613b0757613b17565b613b1081613b73565b9150613b23565b613b2081613bb5565b91505b50919050565b60006000613b3e613b39846129dc565b6129dc565b9050608b60020a811015613b5157613b61565b613b5a81613bb5565b9150613b6d565b613b6a81613b73565b91505b50919050565b60006000613b80836129dc565b9050608c60020a811015613b9357613ba3565b613b9c81613bff565b9150613baf565b613bac81613c41565b91505b50919050565b60006000613bca613bc5846129dc565b6129dc565b9050608c60020a811015613bdd57613bed565b613be681613c41565b9150613bf9565b613bf681613bff565b91505b50919050565b60006000613c0c836129dc565b9050608d60020a811015613c1f57613c2f565b613c2881613c8b565b9150613c3b565b613c3881613ccd565b91505b50919050565b60006000613c56613c51846129dc565b6129dc565b9050608d60020a811015613c6957613c79565b613c7281613ccd565b9150613c85565b613c8281613c8b565b91505b50919050565b60006000613c98836129dc565b9050608e60020a811015613cab57613cbb565b613cb481613d17565b9150613cc7565b613cc481613d59565b91505b50919050565b60006000613ce2613cdd846129dc565b6129dc565b9050608e60020a811015613cf557613d05565b613cfe81613d59565b9150613d11565b613d0e81613d17565b91505b50919050565b60006000613d24836129dc565b9050608f60020a811015613d3757613d47565b613d4081613da3565b9150613d53565b613d5081613de5565b91505b50919050565b60006000613d6e613d69846129dc565b6129dc565b9050608f60020a811015613d8157613d91565b613d8a81613de5565b9150613d9d565b613d9a81613da3565b91505b50919050565b60006000613db0836129dc565b9050609060020a811015613dc357613dd3565b613dcc81613e2f565b9150613ddf565b613ddc81613e71565b91505b50919050565b60006000613dfa613df5846129dc565b6129dc565b9050609060020a811015613e0d57613e1d565b613e1681613e71565b9150613e29565b613e2681613e2f565b91505b50919050565b60006000613e3c836129dc565b9050609160020a811015613e4f57613e5f565b613e5881613ebb565b9150613e6b565b613e6881613efd565b91505b50919050565b60006000613e86613e81846129dc565b6129dc565b9050609160020a811015613e9957613ea9565b613ea281613efd565b9150613eb5565b613eb281613ebb565b91505b50919050565b60006000613ec8836129dc565b9050609260020a811015613edb57613eeb565b613ee481613f47565b9150613ef7565b613ef481613f89565b91505b50919050565b60006000613f12613f0d846129dc565b6129dc565b9050609260020a811015613f2557613f35565b613f2e81613f89565b9150613f41565b613f3e81613f47565b91505b50919050565b60006000613f54836129dc565b9050609360020a811015613f6757613f77565b613f7081613fd3565b9150613f83565b613f8081614015565b91505b50919050565b60006000613f9e613f99846129dc565b6129dc565b9050609360020a811015613fb157613fc1565b613fba81614015565b9150613fcd565b613fca81613fd3565b91505b50919050565b60006000613fe0836129dc565b9050609460020a811015613ff357614003565b613ffc8161405f565b915061400f565b61400c816140a1565b91505b50919050565b6000600061402a614025846129dc565b6129dc565b9050609460020a81101561403d5761404d565b614046816140a1565b9150614059565b6140568161405f565b91505b50919050565b6000600061406c836129dc565b9050609560020a81101561407f5761408f565b614088816140eb565b915061409b565b6140988161412d565b91505b50919050565b600060006140b66140b1846129dc565b6129dc565b9050609560020a8110156140c9576140d9565b6140d28161412d565b91506140e5565b6140e2816140eb565b91505b50919050565b600060006140f8836129dc565b9050609660020a81101561410b5761411b565b61411481614177565b9150614127565b614124816141b9565b91505b50919050565b6000600061414261413d846129dc565b6129dc565b9050609660020a81101561415557614165565b61415e816141b9565b9150614171565b61416e81614177565b91505b50919050565b60006000614184836129dc565b9050609760020a811015614197576141a7565b6141a081614203565b91506141b3565b6141b081614245565b91505b50919050565b600060006141ce6141c9846129dc565b6129dc565b9050609760020a8110156141e1576141f1565b6141ea81614245565b91506141fd565b6141fa81614203565b91505b50919050565b60006000614210836129dc565b9050609860020a81101561422357614233565b61422c8161428f565b915061423f565b61423c816142d1565b91505b50919050565b6000600061425a614255846129dc565b6129dc565b9050609860020a81101561426d5761427d565b614276816142d1565b9150614289565b6142868161428f565b91505b50919050565b6000600061429c836129dc565b9050609960020a8110156142af576142bf565b6142b88161431b565b91506142cb565b6142c88161435d565b91505b50919050565b600060006142e66142e1846129dc565b6129dc565b9050609960020a8110156142f957614309565b6143028161435d565b9150614315565b6143128161431b565b91505b50919050565b60006000614328836129dc565b9050609a60020a81101561433b5761434b565b614344816143a7565b9150614357565b614354816143e9565b91505b50919050565b6000600061437261436d846129dc565b6129dc565b9050609a60020a81101561438557614395565b61438e816143e9565b91506143a1565b61439e816143a7565b91505b50919050565b600060006143b4836129dc565b9050609b60020a8110156143c7576143d7565b6143d081614433565b91506143e3565b6143e081614475565b91505b50919050565b600060006143fe6143f9846129dc565b6129dc565b9050609b60020a81101561441157614421565b61441a81614475565b915061442d565b61442a81614433565b91505b50919050565b60006000614440836129dc565b9050609c60020a81101561445357614463565b61445c816144bf565b915061446f565b61446c81614501565b91505b50919050565b6000600061448a614485846129dc565b6129dc565b9050609c60020a81101561449d576144ad565b6144a681614501565b91506144b9565b6144b6816144bf565b91505b50919050565b600060006144cc836129dc565b9050609d60020a8110156144df576144ef565b6144e88161454b565b91506144fb565b6144f88161458d565b91505b50919050565b60006000614516614511846129dc565b6129dc565b9050609d60020a81101561452957614539565b6145328161458d565b9150614545565b6145428161454b565b91505b50919050565b60006000614558836129dc565b9050609e60020a81101561456b5761457b565b614574816145d7565b9150614587565b61458481614619565b91505b50919050565b600060006145a261459d846129dc565b6129dc565b9050609e60020a8110156145b5576145c5565b6145be81614619565b91506145d1565b6145ce816145d7565b91505b50919050565b600060006145e4836129dc565b9050609f60020a8110156145f757614607565b61460081614663565b9150614613565b614610816146a5565b91505b50919050565b6000600061462e614629846129dc565b6129dc565b9050609f60020a81101561464157614651565b61464a816146a5565b915061465d565b61465a81614663565b91505b50919050565b60006000614670836129dc565b905060a060020a81101561468357614693565b61468c816146ef565b915061469f565b61469c81614731565b91505b50919050565b600060006146ba6146b5846129dc565b6129dc565b905060a060020a8110156146cd576146dd565b6146d681614731565b91506146e9565b6146e6816146ef565b91505b50919050565b600060006146fc836129dc565b905060a160020a81101561470f5761471f565b6147188161477b565b915061472b565b614728816147bd565b91505b50919050565b60006000614746614741846129dc565b6129dc565b905060a160020a81101561475957614769565b614762816147bd565b9150614775565b6147728161477b565b91505b50919050565b60006000614788836129dc565b905060a260020a81101561479b576147ab565b6147a481614807565b91506147b7565b6147b481614849565b91505b50919050565b600060006147d26147cd846129dc565b6129dc565b905060a260020a8110156147e5576147f5565b6147ee81614849565b9150614801565b6147fe81614807565b91505b50919050565b60006000614814836129dc565b905060a360020a81101561482757614837565b61483081614893565b9150614843565b614840816148d5565b91505b50919050565b6000600061485e614859846129dc565b6129dc565b905060a360020a81101561487157614881565b61487a816148d5565b915061488d565b61488a81614893565b91505b50919050565b600060006148a0836129dc565b905060a460020a8110156148b3576148c3565b6148bc8161491f565b91506148cf565b6148cc81614961565b91505b50919050565b600060006148ea6148e5846129dc565b6129dc565b905060a460020a8110156148fd5761490d565b61490681614961565b9150614919565b6149168161491f565b91505b50919050565b6000600061492c836129dc565b905060a560020a81101561493f5761494f565b614948816149ab565b915061495b565b614958816149ed565b91505b50919050565b60006000614976614971846129dc565b6129dc565b905060a560020a81101561498957614999565b614992816149ed565b91506149a5565b6149a2816149ab565b91505b50919050565b600060006149b8836129dc565b905060a660020a8110156149cb576149db565b6149d481614a37565b91506149e7565b6149e481614a79565b91505b50919050565b60006000614a026149fd846129dc565b6129dc565b905060a660020a811015614a1557614a25565b614a1e81614a79565b9150614a31565b614a2e81614a37565b91505b50919050565b60006000614a44836129dc565b905060a760020a811015614a5757614a67565b614a6081614ac3565b9150614a73565b614a7081614b05565b91505b50919050565b60006000614a8e614a89846129dc565b6129dc565b905060a760020a811015614aa157614ab1565b614aaa81614b05565b9150614abd565b614aba81614ac3565b91505b50919050565b60006000614ad0836129dc565b905060a860020a811015614ae357614af3565b614aec81614b4f565b9150614aff565b614afc81614b91565b91505b50919050565b60006000614b1a614b15846129dc565b6129dc565b905060a860020a811015614b2d57614b3d565b614b3681614b91565b9150614b49565b614b4681614b4f565b91505b50919050565b60006000614b5c836129dc565b905060a960020a811015614b6f57614b7f565b614b7881614bdb565b9150614b8b565b614b8881614c1d565b91505b50919050565b60006000614ba6614ba1846129dc565b6129dc565b905060a960020a811015614bb957614bc9565b614bc281614c1d565b9150614bd5565b614bd281614bdb565b91505b50919050565b60006000614be8836129dc565b905060aa60020a811015614bfb57614c0b565b614c0481614c67565b9150614c17565b614c1481614ca9565b91505b50919050565b60006000614c32614c2d846129dc565b6129dc565b905060aa60020a811015614c4557614c55565b614c4e81614ca9565b9150614c61565b614c5e81614c67565b91505b50919050565b60006000614c74836129dc565b905060ab60020a811015614c8757614c97565b614c9081614cf3565b9150614ca3565b614ca081614d35565b91505b50919050565b60006000614cbe614cb9846129dc565b6129dc565b905060ab60020a811015614cd157614ce1565b614cda81614d35565b9150614ced565b614cea81614cf3565b91505b50919050565b60006000614d00836129dc565b905060ac60020a811015614d1357614d23565b614d1c81614d7f565b9150614d2f565b614d2c81614dc1565b91505b50919050565b60006000614d4a614d45846129dc565b6129dc565b905060ac60020a811015614d5d57614d6d565b614d6681614dc1565b9150614d79565b614d7681614d7f565b91505b50919050565b60006000614d8c836129dc565b905060ad60020a811015614d9f57614daf565b614da881614e0b565b9150614dbb565b614db881614e4d565b91505b50919050565b60006000614dd6614dd1846129dc565b6129dc565b905060ad60020a811015614de957614df9565b614df281614e4d565b9150614e05565b614e0281614e0b565b91505b50919050565b60006000614e18836129dc565b905060ae60020a811015614e2b57614e3b565b614e3481614e97565b9150614e47565b614e4481614ed9565b91505b50919050565b60006000614e62614e5d846129dc565b6129dc565b905060ae60020a811015614e7557614e85565b614e7e81614ed9565b9150614e91565b614e8e81614e97565b91505b50919050565b60006000614ea4836129dc565b905060af60020a811015614eb757614ec7565b614ec081614f23565b9150614ed3565b614ed081614f65565b91505b50919050565b60006000614eee614ee9846129dc565b6129dc565b905060af60020a811015614f0157614f11565b614f0a81614f65565b9150614f1d565b614f1a81614f23565b91505b50919050565b60006000614f30836129dc565b905060b060020a811015614f4357614f53565b614f4c81614faf565b9150614f5f565b614f5c81614ff1565b91505b50919050565b60006000614f7a614f75846129dc565b6129dc565b905060b060020a811015614f8d57614f9d565b614f9681614ff1565b9150614fa9565b614fa681614faf565b91505b50919050565b60006000614fbc836129dc565b905060b160020a811015614fcf57614fdf565b614fd881612a11565b9150614feb565b614fe881612a23565b91505b50919050565b60006000615006615001846129dc565b6129dc565b905060b160020a81101561501957615029565b61502281612a23565b9150615035565b61503281612a11565b91505b5091905056",
+        "exec": {
+            "//": "ManyFunctions.start(1)",
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "0x95805DAD0000000000000000000000000000000000000000000000000000000000000001",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "//": "ManyFunctions.sol",
+                "balance": "100000000000000000000000",
+                "code": "0x60e060020a60003504806301f99ad7146108c3578063023a624a146108d857806303bdecf5146108ed57806305fe035f14610902578063082d8f4914610917578063090bf3b71461092c5780630bd9c534146109415780630c4bfa94146109565780630e20ebe21461096b5780630f76de0d1461098057806310cfcc191461099557806313ce15a9146109aa578063140dcec4146109bf57806314d07a3e146109d45780631687f112146109e957806316eb6603146109fe578063172cf71714610a135780631bd6f59614610a285780631cdb857114610a3d5780631cf74ece14610a525780631d09ba2c14610a675780631f69aa5114610a7c578063223dcc7414610a9157806325e524d314610aa6578063261de7c414610abb5780632632924d14610ad05780632909cc5d14610ae55780632981699814610afa5780632a85a45d14610b0f5780632ca36da014610b245780632cbf1f0d14610b395780632d0f557314610b4e5780632d97867814610b6357806331db9efd14610b7857806332064db714610b8d57806332931fbb14610ba2578063355f51a014610bb7578063361bb34014610bcc578063364ddb0e14610be15780633792a01814610bf657806338c68f8f14610c0b57806338e586fd14610c20578063392d42ae14610c3557806339a87bd914610c4a5780633a95a33214610c5f5780633b8ecdf914610c745780633cf0659a14610c895780633eaf992314610c9e5780633fe97ead14610cb35780633ff11c8b14610cc8578063404efc5314610cdd578063407fce7b14610cf257806340c3b18714610d07578063440208c314610d1c57806344e86b2f14610d31578063455df57914610d465780634689ab4d14610d5b57806346be2e0c14610d70578063487cd86f14610d8557806348e6178214610d9a57806349d4a34414610daf5780634a0f597414610dc45780634bc24ec514610dd95780634c2fe45614610dee5780634cc885d414610e035780634eaaad7b14610e185780634eb166af14610e2d5780635050093414610e42578063506bff1114610e57578063508762c114610e6c578063526938f814610e8157806354400c6014610e96578063559510d814610eab57806355a5f70214610ec057806356ca528f14610ed5578063570a2a1614610eea5780635dab2e0f14610eff5780635dca53d314610f1457806362017ebc14610f29578063621a25f814610f3e578063626d4a3614610f5357806362b6a28214610f6857806364faf22c14610f7d57806366d7ffde14610f9257806367b886e814610fa757806367e902c714610fbc57806369d7774014610fd15780636b7ae8e614610fe65780636c3b659114610ffb5780636e54181e146110105780636e978d91146110255780636f63d2ec1461103a578063706332d11461104f57806370ac4bb9146110645780637138ef521461107957806371dd46a91461108e57806372a7c229146110a35780637376fc8d146110b8578063738a2679146110cd57806374552650146110e2578063746fc8d0146110f757806379254bb81461110c5780637adaa3f8146111215780637e4eb35b14611136578063885ec18e1461114b5780638b9ff6b6146111605780638ce113dc146111755780638defbc5e1461118a5780638f4613d51461119f5780638fdc24ba146111b45780639002dba4146111c957806391d15735146111de57806391d43b23146111f357806393b14daa1461120857806394d63afd1461121d57806395805dad1461123257806396f68782146112475780639740e4a21461125c578063981290131461127157806399a3f0e8146112865780639acb1ad41461129b5780639be07908146112b05780639c15be0b146112c55780639d451c4d146112da5780639d8ee943146112ef5780639ef6ca0f14611304578063a0db0a2214611319578063a18e2eb91461132e578063a408384914611343578063a57544da14611358578063a5a83e4d1461136d578063a6843f3414611382578063a6dacdd714611397578063a8c4c8bc146113ac578063aa058a73146113c1578063aad62da2146113d6578063aaf3e4f4146113eb578063ab81e77314611400578063abc93aee14611415578063abde33f71461142a578063b114b96c1461143f578063b3df873714611454578063b4174cb014611469578063b5d02a561461147e578063b731e84814611493578063b7b96723146114a8578063bbcded7a146114bd578063bbececa9146114d2578063beca7440146114e7578063bf8981c0146114fc578063c028c67414611511578063c2385fa614611526578063c319a02c1461153b578063c569bae014611550578063c6715f8114611565578063c7b98dec1461157a578063c9acab841461158f578063ca9efc73146115a4578063cad80024146115b9578063cdadb0fa146115ce578063cdbdf391146115e3578063cf460fa5146115f8578063cf69318a1461160d578063d1835b8c14611622578063d353a1cb14611637578063d3e141e01461164c578063d5ec7e1d14611661578063d7ead1de14611676578063d90b02aa1461168b578063d959e244146116a0578063d9e68b44146116b5578063daacb24f146116ca578063dc12a805146116df578063dd946033146116f4578063dda5142414611709578063de6612171461171e578063dfb9560c14611733578063e03827d214611748578063e21720001461175d578063e2c718d814611772578063e3da539914611787578063e48e603f1461179c578063e5f9ec29146117b1578063e6c0459a146117c6578063e70addec146117db578063e7a01215146117f0578063ea7f4d2714611805578063ebb6c59f1461181a578063ed6302be1461182f578063ed64b36b14611844578063eecd278914611859578063f0ed14e01461186e578063f0f2134414611883578063f1e328f914611898578063f1e6f4cd146118ad578063f32fe995146118c2578063f75165c6146118d7578063f7ed71d0146118ec578063f80f44f314611901578063f8bc050514611916578063fbd3c51a1461192b578063fd72009014611940578063fed3a3001461195557005b6108ce600435612edf565b8060005260206000f35b6108e3600435612fb5565b8060005260206000f35b6108f8600435613f47565b8060005260206000f35b61090d600435612a11565b8060005260206000f35b6109226004356127ec565b8060005260206000f35b61093760043561215c565b8060005260206000f35b61094c6004356128c2565b8060005260206000f35b61096160043561310f565b8060005260206000f35b610976600435614e0b565b8060005260206000f35b61098b600435613269565b8060005260206000f35b6109a0600435611a82565b8060005260206000f35b6109b5600435613e71565b8060005260206000f35b6109ca600435611dd2565b8060005260206000f35b6109df6004356120d0565b8060005260206000f35b6109f4600435613755565b8060005260206000f35b610a096004356134e3565b8060005260206000f35b610a1e6004356137e1565b8060005260206000f35b610a3360043561382b565b8060005260206000f35b610a48600435612b0b565b8060005260206000f35b610a5d60043561386d565b8060005260206000f35b610a726004356131e5565b8060005260206000f35b610a876004356143e9565b8060005260206000f35b610a9c60043561319b565b8060005260206000f35b610ab1600435612e11565b8060005260206000f35b610ac660043561234a565b8060005260206000f35b610adb6004356121e8565b8060005260206000f35b610af06004356119f6565b8060005260206000f35b610b05600435613bff565b8060005260206000f35b610b1a600435612606565b8060005260206000f35b610b2f6004356126d4565b8060005260206000f35b610b44600435613bb5565b8060005260206000f35b610b59600435612462565b8060005260206000f35b610b6e600435611e14565b8060005260206000f35b610b836004356149ab565b8060005260206000f35b610b98600435611c26565b8060005260206000f35b610bad600435612a7f565b8060005260206000f35b610bc2600435613457565b8060005260206000f35b610bd760043561340d565b8060005260206000f35b610bec60043561363d565b8060005260206000f35b610c01600435612e53565b8060005260206000f35b610c1660043561477b565b8060005260206000f35b610c2b600435612c6d565b8060005260206000f35b610c40600435612648565b8060005260206000f35b610c55600435612274565b8060005260206000f35b610c6a6004356138f9565b8060005260206000f35b610c7f600435612b55565b8060005260206000f35b610c94600435611eea565b8060005260206000f35b610ca9600435613ebb565b8060005260206000f35b610cbe600435613499565b8060005260206000f35b610cd3600435614807565b8060005260206000f35b610ce8600435611fb8565b8060005260206000f35b610cfd600435613083565b8060005260206000f35b610d126004356125bc565b8060005260206000f35b610d27600435613041565b8060005260206000f35b610d3c6004356140a1565b8060005260206000f35b610d516004356147bd565b8060005260206000f35b610d66600435611c70565b8060005260206000f35b610d7b600435612300565b8060005260206000f35b610d906004356123d6565b8060005260206000f35b610da5600435612c23565b8060005260206000f35b610dba600435614faf565b8060005260206000f35b610dcf600435612044565b8060005260206000f35b610de4600435613ae7565b8060005260206000f35b610df9600435614cf3565b8060005260206000f35b610e0e600435613d17565b8060005260206000f35b610e2360043561412d565b8060005260206000f35b610e38600435614177565b8060005260206000f35b610e4d60043561208e565b8060005260206000f35b610e62600435612dc7565b8060005260206000f35b610e77600435612f29565b8060005260206000f35b610e8c6004356124a4565b8060005260206000f35b610ea1600435611b58565b8060005260206000f35b610eb66004356136c9565b8060005260206000f35b610ecb600435613227565b8060005260206000f35b610ee0600435611acc565b8060005260206000f35b610ef5600435613687565b8060005260206000f35b610f0a6004356146a5565b8060005260206000f35b610f1f6004356121a6565b8060005260206000f35b610f346004356132f5565b8060005260206000f35b610f49600435613da3565b8060005260206000f35b610f5e60043561379f565b8060005260206000f35b610f73600435612878565b8060005260206000f35b610f88600435611b0e565b8060005260206000f35b610f9d600435611ea0565b8060005260206000f35b610fb2600435614ed9565b8060005260206000f35b610fc7600435614bdb565b8060005260206000f35b610fdc600435614c1d565b8060005260206000f35b610ff1600435614245565b8060005260206000f35b6110066004356146ef565b8060005260206000f35b61101b60043561428f565b8060005260206000f35b611030600435614ac3565b8060005260206000f35b611045600435613de5565b8060005260206000f35b61105a6004356132b3565b8060005260206000f35b61106f6004356122be565b8060005260206000f35b611084600435612e9d565b8060005260206000f35b611099600435611b9a565b8060005260206000f35b6110ae6004356127aa565b8060005260206000f35b6110c3600435613e2f565b8060005260206000f35b6110d8600435614849565b8060005260206000f35b6110ed600435614dc1565b8060005260206000f35b61110260043561333f565b8060005260206000f35b61111760043561211a565b8060005260206000f35b61112c600435612692565b8060005260206000f35b611141600435612904565b8060005260206000f35b611156600435612d3b565b8060005260206000f35b61116b600435614b91565b8060005260206000f35b611180600435613a5b565b8060005260206000f35b611195600435612232565b8060005260206000f35b6111aa600435612f6b565b8060005260206000f35b6111bf600435614d35565b8060005260206000f35b6111d4600435611a40565b8060005260206000f35b6111e9600435612ff7565b8060005260206000f35b6111fe60043561431b565b8060005260206000f35b611213600435613159565b8060005260206000f35b611228600435612b97565b8060005260206000f35b61123d600435612990565b8060005260206000f35b611252600435613b73565b8060005260206000f35b611267600435614961565b8060005260206000f35b61127c600435613381565b8060005260206000f35b611291600435613fd3565b8060005260206000f35b6112a660043561257a565b8060005260206000f35b6112bb600435614501565b8060005260206000f35b6112d0600435613d59565b8060005260206000f35b6112e56004356143a7565b8060005260206000f35b6112fa60043561405f565b8060005260206000f35b61130f60043561238c565b8060005260206000f35b611324600435612be1565b8060005260206000f35b611339600435613f89565b8060005260206000f35b61134e60043561294e565b8060005260206000f35b6113636004356124ee565b8060005260206000f35b611378600435614b4f565b8060005260206000f35b61138d6004356133cb565b8060005260206000f35b6113a26004356139cf565b8060005260206000f35b6113b7600435613c8b565b8060005260206000f35b6113cc600435612cf9565b8060005260206000f35b6113e1600435614a79565b8060005260206000f35b6113f66004356149ed565b8060005260206000f35b61140b600435613b29565b8060005260206000f35b611420600435613ccd565b8060005260206000f35b611435600435611f76565b8060005260206000f35b61144a600435614ff1565b8060005260206000f35b61145f600435613525565b8060005260206000f35b61147460043561356f565b8060005260206000f35b6114896004356129dc565b8060005260206000f35b61149e600435614ca9565b8060005260206000f35b6114b3600435612d85565b8060005260206000f35b6114c86004356141b9565b8060005260206000f35b6114dd600435614475565b8060005260206000f35b6114f26004356135fb565b8060005260206000f35b611507600435612530565b8060005260206000f35b61151c600435614663565b8060005260206000f35b611531600435614433565b8060005260206000f35b611546600435614f23565b8060005260206000f35b61155b600435614c67565b8060005260206000f35b611570600435611d3e565b8060005260206000f35b611585600435612a3d565b8060005260206000f35b61159a600435613a11565b8060005260206000f35b6115af600435614619565b8060005260206000f35b6115c4600435613985565b8060005260206000f35b6115d9600435613943565b8060005260206000f35b6115ee600435612418565b8060005260206000f35b6116036004356119b4565b8060005260206000f35b611618600435613a9d565b8060005260206000f35b61162d600435611cb2565b8060005260206000f35b6116426004356129d2565b8060005260206000f35b611657600435612caf565b8060005260206000f35b61166c600435611d88565b8060005260206000f35b611681600435614203565b8060005260206000f35b61169660043561458d565b8060005260206000f35b6116ab600435611f2c565b8060005260206000f35b6116c0600435612a23565b8060005260206000f35b6116d5600435612836565b8060005260206000f35b6116ea6004356138b7565b8060005260206000f35b6116ff6004356145d7565b8060005260206000f35b61171460043561454b565b8060005260206000f35b6117296004356142d1565b8060005260206000f35b61173e600435611e5e565b8060005260206000f35b611753600435614015565b8060005260206000f35b611768600435613c41565b8060005260206000f35b61177d600435611be4565b8060005260206000f35b611792600435614b05565b8060005260206000f35b6117a7600435613713565b8060005260206000f35b6117bc6004356135b1565b8060005260206000f35b6117d16004356144bf565b8060005260206000f35b6117e660043561491f565b8060005260206000f35b6117fb600435612ac9565b8060005260206000f35b6118106004356130cd565b8060005260206000f35b6118256004356140eb565b8060005260206000f35b61183a600435614f65565b8060005260206000f35b61184f60043561196a565b8060005260206000f35b6118646004356148d5565b8060005260206000f35b611879600435614d7f565b8060005260206000f35b61188e600435612002565b8060005260206000f35b6118a3600435613efd565b8060005260206000f35b6118b860043561271e565b8060005260206000f35b6118cd600435614e4d565b8060005260206000f35b6118e2600435611cfc565b8060005260206000f35b6118f7600435612760565b8060005260206000f35b61190c600435614e97565b8060005260206000f35b61192160043561435d565b8060005260206000f35b611936600435614731565b8060005260206000f35b61194b600435614893565b8060005260206000f35b611960600435614a37565b8060005260206000f35b6000600061197f61197a846129dc565b6129dc565b9050605d60020a811015611992576119a2565b61199b816119f6565b91506119ae565b6119ab816119b4565b91505b50919050565b600060006119c1836129dc565b9050605e60020a8110156119d4576119e4565b6119dd81611a40565b91506119f0565b6119ed81611a82565b91505b50919050565b60006000611a0b611a06846129dc565b6129dc565b9050605e60020a811015611a1e57611a2e565b611a2781611a82565b9150611a3a565b611a3781611a40565b91505b50919050565b60006000611a4d836129dc565b9050605f60020a811015611a6057611a70565b611a6981611acc565b9150611a7c565b611a7981611b0e565b91505b50919050565b60006000611a97611a92846129dc565b6129dc565b9050605f60020a811015611aaa57611aba565b611ab381611b0e565b9150611ac6565b611ac381611acc565b91505b50919050565b60006000611ad9836129dc565b9050606060020a811015611aec57611afc565b611af581611b58565b9150611b08565b611b0581611b9a565b91505b50919050565b60006000611b23611b1e846129dc565b6129dc565b9050606060020a811015611b3657611b46565b611b3f81611b9a565b9150611b52565b611b4f81611b58565b91505b50919050565b60006000611b65836129dc565b9050606160020a811015611b7857611b88565b611b8181611be4565b9150611b94565b611b9181611c26565b91505b50919050565b60006000611baf611baa846129dc565b6129dc565b9050606160020a811015611bc257611bd2565b611bcb81611c26565b9150611bde565b611bdb81611be4565b91505b50919050565b60006000611bf1836129dc565b9050606260020a811015611c0457611c14565b611c0d81611c70565b9150611c20565b611c1d81611cb2565b91505b50919050565b60006000611c3b611c36846129dc565b6129dc565b9050606260020a811015611c4e57611c5e565b611c5781611cb2565b9150611c6a565b611c6781611c70565b91505b50919050565b60006000611c7d836129dc565b9050606360020a811015611c9057611ca0565b611c9981611cfc565b9150611cac565b611ca981611d88565b91505b50919050565b60006000611cc7611cc2846129dc565b6129dc565b9050606360020a811015611cda57611cea565b611ce381611d88565b9150611cf6565b611cf381611cfc565b91505b50919050565b60006000611d09836129dc565b9050606460020a811015611d1c57611d2c565b611d2581611dd2565b9150611d38565b611d3581611e14565b91505b50919050565b60006000611d53611d4e846129dc565b6129dc565b9050607a60020a811015611d6657611d76565b611d6f81613269565b9150611d82565b611d7f81613227565b91505b50919050565b60006000611d9d611d98846129dc565b6129dc565b9050606460020a811015611db057611dc0565b611db981611e14565b9150611dcc565b611dc981611dd2565b91505b50919050565b60006000611ddf836129dc565b9050606560020a811015611df257611e02565b611dfb81611e5e565b9150611e0e565b611e0b81611ea0565b91505b50919050565b60006000611e29611e24846129dc565b6129dc565b9050606560020a811015611e3c57611e4c565b611e4581611ea0565b9150611e58565b611e5581611e5e565b91505b50919050565b60006000611e6b836129dc565b9050606660020a811015611e7e57611e8e565b611e8781611eea565b9150611e9a565b611e9781611f2c565b91505b50919050565b60006000611eb5611eb0846129dc565b6129dc565b9050606660020a811015611ec857611ed8565b611ed181611f2c565b9150611ee4565b611ee181611eea565b91505b50919050565b60006000611ef7836129dc565b9050606760020a811015611f0a57611f1a565b611f1381611f76565b9150611f26565b611f2381611fb8565b91505b50919050565b60006000611f41611f3c846129dc565b6129dc565b9050606760020a811015611f5457611f64565b611f5d81611fb8565b9150611f70565b611f6d81611f76565b91505b50919050565b60006000611f83836129dc565b9050606860020a811015611f9657611fa6565b611f9f81612002565b9150611fb2565b611faf81612044565b91505b50919050565b60006000611fcd611fc8846129dc565b6129dc565b9050606860020a811015611fe057611ff0565b611fe981612044565b9150611ffc565b611ff981612002565b91505b50919050565b6000600061200f836129dc565b9050606960020a81101561202257612032565b61202b8161208e565b915061203e565b61203b816120d0565b91505b50919050565b60006000612059612054846129dc565b6129dc565b9050606960020a81101561206c5761207c565b612075816120d0565b9150612088565b6120858161208e565b91505b50919050565b6000600061209b836129dc565b9050606a60020a8110156120ae576120be565b6120b78161211a565b91506120ca565b6120c78161215c565b91505b50919050565b600060006120e56120e0846129dc565b6129dc565b9050606a60020a8110156120f857612108565b6121018161215c565b9150612114565b6121118161211a565b91505b50919050565b60006000612127836129dc565b9050606b60020a81101561213a5761214a565b612143816121a6565b9150612156565b612153816121e8565b91505b50919050565b6000600061217161216c846129dc565b6129dc565b9050606b60020a81101561218457612194565b61218d816121e8565b91506121a0565b61219d816121a6565b91505b50919050565b600060006121b3836129dc565b9050606c60020a8110156121c6576121d6565b6121cf81612232565b91506121e2565b6121df81612274565b91505b50919050565b600060006121fd6121f8846129dc565b6129dc565b9050606c60020a81101561221057612220565b61221981612274565b915061222c565b61222981612232565b91505b50919050565b6000600061223f836129dc565b9050606d60020a81101561225257612262565b61225b816122be565b915061226e565b61226b81612300565b91505b50919050565b60006000612289612284846129dc565b6129dc565b9050606d60020a81101561229c576122ac565b6122a581612300565b91506122b8565b6122b5816122be565b91505b50919050565b600060006122cb836129dc565b9050606e60020a8110156122de576122ee565b6122e78161234a565b91506122fa565b6122f78161238c565b91505b50919050565b60006000612315612310846129dc565b6129dc565b9050606e60020a81101561232857612338565b6123318161238c565b9150612344565b6123418161234a565b91505b50919050565b60006000612357836129dc565b9050606f60020a81101561236a5761237a565b612373816123d6565b9150612386565b61238381612418565b91505b50919050565b600060006123a161239c846129dc565b6129dc565b9050606f60020a8110156123b4576123c4565b6123bd81612418565b91506123d0565b6123cd816123d6565b91505b50919050565b600060006123e3836129dc565b9050607060020a8110156123f657612406565b6123ff81612462565b9150612412565b61240f816124a4565b91505b50919050565b6000600061242d612428846129dc565b6129dc565b9050607060020a81101561244057612450565b612449816124a4565b915061245c565b61245981612462565b91505b50919050565b6000600061246f836129dc565b9050607160020a81101561248257612492565b61248b816124ee565b915061249e565b61249b81612530565b91505b50919050565b600060006124b96124b4846129dc565b6129dc565b9050607160020a8110156124cc576124dc565b6124d581612530565b91506124e8565b6124e5816124ee565b91505b50919050565b600060006124fb836129dc565b9050607260020a81101561250e5761251e565b6125178161257a565b915061252a565b612527816125bc565b91505b50919050565b60006000612545612540846129dc565b6129dc565b9050607260020a81101561255857612568565b612561816125bc565b9150612574565b6125718161257a565b91505b50919050565b60006000612587836129dc565b9050607360020a81101561259a576125aa565b6125a381612606565b91506125b6565b6125b381612648565b91505b50919050565b600060006125d16125cc846129dc565b6129dc565b9050607360020a8110156125e4576125f4565b6125ed81612648565b9150612600565b6125fd81612606565b91505b50919050565b60006000612613836129dc565b9050607460020a81101561262657612636565b61262f81612692565b9150612642565b61263f816126d4565b91505b50919050565b6000600061265d612658846129dc565b6129dc565b9050607460020a81101561267057612680565b612679816126d4565b915061268c565b61268981612692565b91505b50919050565b6000600061269f836129dc565b9050607560020a8110156126b2576126c2565b6126bb8161271e565b91506126ce565b6126cb81612760565b91505b50919050565b600060006126e96126e4846129dc565b6129dc565b9050607560020a8110156126fc5761270c565b61270581612760565b9150612718565b6127158161271e565b91505b50919050565b6000600061272b836129dc565b9050607660020a81101561273e5761274e565b612747816127aa565b915061275a565b612757816127ec565b91505b50919050565b60006000612775612770846129dc565b6129dc565b9050607660020a81101561278857612798565b612791816127ec565b91506127a4565b6127a1816127aa565b91505b50919050565b600060006127b7836129dc565b9050607760020a8110156127ca576127da565b6127d381612836565b91506127e6565b6127e381612878565b91505b50919050565b600060006128016127fc846129dc565b6129dc565b9050607760020a81101561281457612824565b61281d81612878565b9150612830565b61282d81612836565b91505b50919050565b60006000612843836129dc565b9050607860020a81101561285657612866565b61285f816128c2565b9150612872565b61286f81612904565b91505b50919050565b6000600061288d612888846129dc565b6129dc565b9050607860020a8110156128a0576128b0565b6128a981612904565b91506128bc565b6128b9816128c2565b91505b50919050565b600060006128cf836129dc565b9050607960020a8110156128e2576128f2565b6128eb8161294e565b91506128fe565b6128fb81611d3e565b91505b50919050565b60006000612919612914846129dc565b6129dc565b9050607960020a81101561292c5761293c565b61293581611d3e565b9150612948565b6129458161294e565b91505b50919050565b6000600061295b836129dc565b9050607a60020a81101561296e5761297e565b61297781613227565b915061298a565b61298781613269565b91505b50919050565b6000600061299d836129dc565b9050604e60020a8110156129b0576129c0565b6129b981612a7f565b91506129cc565b6129c981612a3d565b91505b50919050565b6000819050919050565b600060007f5851f42d4c957f2c0000000000000000000000000000000000000000000000019050828102600101915050919050565b6000612a1c826129d2565b9050919050565b6000612a36612a31836129dc565b6129d2565b9050919050565b60006000612a4a836129dc565b9050604f60020a811015612a5d57612a6d565b612a6681612ac9565b9150612a79565b612a7681612b0b565b91505b50919050565b60006000612a94612a8f846129dc565b6129dc565b9050604f60020a811015612aa757612ab7565b612ab081612b0b565b9150612ac3565b612ac081612ac9565b91505b50919050565b60006000612ad6836129dc565b9050605060020a811015612ae957612af9565b612af281612b55565b9150612b05565b612b0281612b97565b91505b50919050565b60006000612b20612b1b846129dc565b6129dc565b9050605060020a811015612b3357612b43565b612b3c81612b97565b9150612b4f565b612b4c81612b55565b91505b50919050565b60006000612b62836129dc565b9050605160020a811015612b7557612b85565b612b7e81612be1565b9150612b91565b612b8e81612c23565b91505b50919050565b60006000612bac612ba7846129dc565b6129dc565b9050605160020a811015612bbf57612bcf565b612bc881612c23565b9150612bdb565b612bd881612be1565b91505b50919050565b60006000612bee836129dc565b9050605260020a811015612c0157612c11565b612c0a81612c6d565b9150612c1d565b612c1a81612caf565b91505b50919050565b60006000612c38612c33846129dc565b6129dc565b9050605260020a811015612c4b57612c5b565b612c5481612caf565b9150612c67565b612c6481612c6d565b91505b50919050565b60006000612c7a836129dc565b9050605360020a811015612c8d57612c9d565b612c9681612cf9565b9150612ca9565b612ca681612d3b565b91505b50919050565b60006000612cc4612cbf846129dc565b6129dc565b9050605360020a811015612cd757612ce7565b612ce081612d3b565b9150612cf3565b612cf081612cf9565b91505b50919050565b60006000612d06836129dc565b9050605460020a811015612d1957612d29565b612d2281612d85565b9150612d35565b612d3281612dc7565b91505b50919050565b60006000612d50612d4b846129dc565b6129dc565b9050605460020a811015612d6357612d73565b612d6c81612dc7565b9150612d7f565b612d7c81612d85565b91505b50919050565b60006000612d92836129dc565b9050605560020a811015612da557612db5565b612dae81612e11565b9150612dc1565b612dbe81612e53565b91505b50919050565b60006000612ddc612dd7846129dc565b6129dc565b9050605560020a811015612def57612dff565b612df881612e53565b9150612e0b565b612e0881612e11565b91505b50919050565b60006000612e1e836129dc565b9050605660020a811015612e3157612e41565b612e3a81612e9d565b9150612e4d565b612e4a81612edf565b91505b50919050565b60006000612e68612e63846129dc565b6129dc565b9050605660020a811015612e7b57612e8b565b612e8481612edf565b9150612e97565b612e9481612e9d565b91505b50919050565b60006000612eaa836129dc565b9050605760020a811015612ebd57612ecd565b612ec681612f29565b9150612ed9565b612ed681612f6b565b91505b50919050565b60006000612ef4612eef846129dc565b6129dc565b9050605760020a811015612f0757612f17565b612f1081612f6b565b9150612f23565b612f2081612f29565b91505b50919050565b60006000612f36836129dc565b9050605860020a811015612f4957612f59565b612f5281612fb5565b9150612f65565b612f6281612ff7565b91505b50919050565b60006000612f80612f7b846129dc565b6129dc565b9050605860020a811015612f9357612fa3565b612f9c81612ff7565b9150612faf565b612fac81612fb5565b91505b50919050565b60006000612fc2836129dc565b9050605960020a811015612fd557612fe5565b612fde81613041565b9150612ff1565b612fee81613083565b91505b50919050565b6000600061300c613007846129dc565b6129dc565b9050605960020a81101561301f5761302f565b61302881613083565b915061303b565b61303881613041565b91505b50919050565b6000600061304e836129dc565b9050605a60020a81101561306157613071565b61306a816130cd565b915061307d565b61307a8161310f565b91505b50919050565b60006000613098613093846129dc565b6129dc565b9050605a60020a8110156130ab576130bb565b6130b48161310f565b91506130c7565b6130c4816130cd565b91505b50919050565b600060006130da836129dc565b9050605b60020a8110156130ed576130fd565b6130f681613159565b9150613109565b6131068161319b565b91505b50919050565b6000600061312461311f846129dc565b6129dc565b9050605b60020a81101561313757613147565b6131408161319b565b9150613153565b61315081613159565b91505b50919050565b60006000613166836129dc565b9050605c60020a81101561317957613189565b613182816131e5565b9150613195565b6131928161196a565b91505b50919050565b600060006131b06131ab846129dc565b6129dc565b9050605c60020a8110156131c3576131d3565b6131cc8161196a565b91506131df565b6131dc816131e5565b91505b50919050565b600060006131f2836129dc565b9050605d60020a81101561320557613215565b61320e816119b4565b9150613221565b61321e816119f6565b91505b50919050565b60006000613234836129dc565b9050607b60020a81101561324757613257565b613250816132b3565b9150613263565b613260816132f5565b91505b50919050565b6000600061327e613279846129dc565b6129dc565b9050607b60020a811015613291576132a1565b61329a816132f5565b91506132ad565b6132aa816132b3565b91505b50919050565b600060006132c0836129dc565b9050607c60020a8110156132d3576132e3565b6132dc8161333f565b91506132ef565b6132ec81613381565b91505b50919050565b6000600061330a613305846129dc565b6129dc565b9050607c60020a81101561331d5761332d565b61332681613381565b9150613339565b6133368161333f565b91505b50919050565b6000600061334c836129dc565b9050607d60020a81101561335f5761336f565b613368816133cb565b915061337b565b6133788161340d565b91505b50919050565b60006000613396613391846129dc565b6129dc565b9050607d60020a8110156133a9576133b9565b6133b28161340d565b91506133c5565b6133c2816133cb565b91505b50919050565b600060006133d8836129dc565b9050607e60020a8110156133eb576133fb565b6133f481613457565b9150613407565b61340481613499565b91505b50919050565b6000600061342261341d846129dc565b6129dc565b9050607e60020a81101561343557613445565b61343e81613499565b9150613451565b61344e81613457565b91505b50919050565b60006000613464836129dc565b9050607f60020a81101561347757613487565b613480816134e3565b9150613493565b61349081613525565b91505b50919050565b600060006134ae6134a9846129dc565b6129dc565b9050607f60020a8110156134c1576134d1565b6134ca81613525565b91506134dd565b6134da816134e3565b91505b50919050565b600060006134f0836129dc565b9050608060020a81101561350357613513565b61350c8161356f565b915061351f565b61351c816135b1565b91505b50919050565b6000600061353a613535846129dc565b6129dc565b9050608060020a81101561354d5761355d565b613556816135b1565b9150613569565b6135668161356f565b91505b50919050565b6000600061357c836129dc565b9050608160020a81101561358f5761359f565b613598816135fb565b91506135ab565b6135a88161363d565b91505b50919050565b600060006135c66135c1846129dc565b6129dc565b9050608160020a8110156135d9576135e9565b6135e28161363d565b91506135f5565b6135f2816135fb565b91505b50919050565b60006000613608836129dc565b9050608260020a81101561361b5761362b565b61362481613687565b9150613637565b613634816136c9565b91505b50919050565b6000600061365261364d846129dc565b6129dc565b9050608260020a81101561366557613675565b61366e816136c9565b9150613681565b61367e81613687565b91505b50919050565b60006000613694836129dc565b9050608360020a8110156136a7576136b7565b6136b081613713565b91506136c3565b6136c081613755565b91505b50919050565b600060006136de6136d9846129dc565b6129dc565b9050608360020a8110156136f157613701565b6136fa81613755565b915061370d565b61370a81613713565b91505b50919050565b60006000613720836129dc565b9050608460020a81101561373357613743565b61373c8161379f565b915061374f565b61374c816137e1565b91505b50919050565b6000600061376a613765846129dc565b6129dc565b9050608460020a81101561377d5761378d565b613786816137e1565b9150613799565b6137968161379f565b91505b50919050565b600060006137ac836129dc565b9050608560020a8110156137bf576137cf565b6137c88161382b565b91506137db565b6137d88161386d565b91505b50919050565b600060006137f66137f1846129dc565b6129dc565b9050608560020a81101561380957613819565b6138128161386d565b9150613825565b6138228161382b565b91505b50919050565b60006000613838836129dc565b9050608660020a81101561384b5761385b565b613854816138b7565b9150613867565b613864816138f9565b91505b50919050565b6000600061388261387d846129dc565b6129dc565b9050608660020a811015613895576138a5565b61389e816138f9565b91506138b1565b6138ae816138b7565b91505b50919050565b600060006138c4836129dc565b9050608760020a8110156138d7576138e7565b6138e081613943565b91506138f3565b6138f081613985565b91505b50919050565b6000600061390e613909846129dc565b6129dc565b9050608760020a81101561392157613931565b61392a81613985565b915061393d565b61393a81613943565b91505b50919050565b60006000613950836129dc565b9050608860020a81101561396357613973565b61396c816139cf565b915061397f565b61397c81613a11565b91505b50919050565b6000600061399a613995846129dc565b6129dc565b9050608860020a8110156139ad576139bd565b6139b681613a11565b91506139c9565b6139c6816139cf565b91505b50919050565b600060006139dc836129dc565b9050608960020a8110156139ef576139ff565b6139f881613a5b565b9150613a0b565b613a0881613a9d565b91505b50919050565b60006000613a26613a21846129dc565b6129dc565b9050608960020a811015613a3957613a49565b613a4281613a9d565b9150613a55565b613a5281613a5b565b91505b50919050565b60006000613a68836129dc565b9050608a60020a811015613a7b57613a8b565b613a8481613ae7565b9150613a97565b613a9481613b29565b91505b50919050565b60006000613ab2613aad846129dc565b6129dc565b9050608a60020a811015613ac557613ad5565b613ace81613b29565b9150613ae1565b613ade81613ae7565b91505b50919050565b60006000613af4836129dc565b9050608b60020a811015613b0757613b17565b613b1081613b73565b9150613b23565b613b2081613bb5565b91505b50919050565b60006000613b3e613b39846129dc565b6129dc565b9050608b60020a811015613b5157613b61565b613b5a81613bb5565b9150613b6d565b613b6a81613b73565b91505b50919050565b60006000613b80836129dc565b9050608c60020a811015613b9357613ba3565b613b9c81613bff565b9150613baf565b613bac81613c41565b91505b50919050565b60006000613bca613bc5846129dc565b6129dc565b9050608c60020a811015613bdd57613bed565b613be681613c41565b9150613bf9565b613bf681613bff565b91505b50919050565b60006000613c0c836129dc565b9050608d60020a811015613c1f57613c2f565b613c2881613c8b565b9150613c3b565b613c3881613ccd565b91505b50919050565b60006000613c56613c51846129dc565b6129dc565b9050608d60020a811015613c6957613c79565b613c7281613ccd565b9150613c85565b613c8281613c8b565b91505b50919050565b60006000613c98836129dc565b9050608e60020a811015613cab57613cbb565b613cb481613d17565b9150613cc7565b613cc481613d59565b91505b50919050565b60006000613ce2613cdd846129dc565b6129dc565b9050608e60020a811015613cf557613d05565b613cfe81613d59565b9150613d11565b613d0e81613d17565b91505b50919050565b60006000613d24836129dc565b9050608f60020a811015613d3757613d47565b613d4081613da3565b9150613d53565b613d5081613de5565b91505b50919050565b60006000613d6e613d69846129dc565b6129dc565b9050608f60020a811015613d8157613d91565b613d8a81613de5565b9150613d9d565b613d9a81613da3565b91505b50919050565b60006000613db0836129dc565b9050609060020a811015613dc357613dd3565b613dcc81613e2f565b9150613ddf565b613ddc81613e71565b91505b50919050565b60006000613dfa613df5846129dc565b6129dc565b9050609060020a811015613e0d57613e1d565b613e1681613e71565b9150613e29565b613e2681613e2f565b91505b50919050565b60006000613e3c836129dc565b9050609160020a811015613e4f57613e5f565b613e5881613ebb565b9150613e6b565b613e6881613efd565b91505b50919050565b60006000613e86613e81846129dc565b6129dc565b9050609160020a811015613e9957613ea9565b613ea281613efd565b9150613eb5565b613eb281613ebb565b91505b50919050565b60006000613ec8836129dc565b9050609260020a811015613edb57613eeb565b613ee481613f47565b9150613ef7565b613ef481613f89565b91505b50919050565b60006000613f12613f0d846129dc565b6129dc565b9050609260020a811015613f2557613f35565b613f2e81613f89565b9150613f41565b613f3e81613f47565b91505b50919050565b60006000613f54836129dc565b9050609360020a811015613f6757613f77565b613f7081613fd3565b9150613f83565b613f8081614015565b91505b50919050565b60006000613f9e613f99846129dc565b6129dc565b9050609360020a811015613fb157613fc1565b613fba81614015565b9150613fcd565b613fca81613fd3565b91505b50919050565b60006000613fe0836129dc565b9050609460020a811015613ff357614003565b613ffc8161405f565b915061400f565b61400c816140a1565b91505b50919050565b6000600061402a614025846129dc565b6129dc565b9050609460020a81101561403d5761404d565b614046816140a1565b9150614059565b6140568161405f565b91505b50919050565b6000600061406c836129dc565b9050609560020a81101561407f5761408f565b614088816140eb565b915061409b565b6140988161412d565b91505b50919050565b600060006140b66140b1846129dc565b6129dc565b9050609560020a8110156140c9576140d9565b6140d28161412d565b91506140e5565b6140e2816140eb565b91505b50919050565b600060006140f8836129dc565b9050609660020a81101561410b5761411b565b61411481614177565b9150614127565b614124816141b9565b91505b50919050565b6000600061414261413d846129dc565b6129dc565b9050609660020a81101561415557614165565b61415e816141b9565b9150614171565b61416e81614177565b91505b50919050565b60006000614184836129dc565b9050609760020a811015614197576141a7565b6141a081614203565b91506141b3565b6141b081614245565b91505b50919050565b600060006141ce6141c9846129dc565b6129dc565b9050609760020a8110156141e1576141f1565b6141ea81614245565b91506141fd565b6141fa81614203565b91505b50919050565b60006000614210836129dc565b9050609860020a81101561422357614233565b61422c8161428f565b915061423f565b61423c816142d1565b91505b50919050565b6000600061425a614255846129dc565b6129dc565b9050609860020a81101561426d5761427d565b614276816142d1565b9150614289565b6142868161428f565b91505b50919050565b6000600061429c836129dc565b9050609960020a8110156142af576142bf565b6142b88161431b565b91506142cb565b6142c88161435d565b91505b50919050565b600060006142e66142e1846129dc565b6129dc565b9050609960020a8110156142f957614309565b6143028161435d565b9150614315565b6143128161431b565b91505b50919050565b60006000614328836129dc565b9050609a60020a81101561433b5761434b565b614344816143a7565b9150614357565b614354816143e9565b91505b50919050565b6000600061437261436d846129dc565b6129dc565b9050609a60020a81101561438557614395565b61438e816143e9565b91506143a1565b61439e816143a7565b91505b50919050565b600060006143b4836129dc565b9050609b60020a8110156143c7576143d7565b6143d081614433565b91506143e3565b6143e081614475565b91505b50919050565b600060006143fe6143f9846129dc565b6129dc565b9050609b60020a81101561441157614421565b61441a81614475565b915061442d565b61442a81614433565b91505b50919050565b60006000614440836129dc565b9050609c60020a81101561445357614463565b61445c816144bf565b915061446f565b61446c81614501565b91505b50919050565b6000600061448a614485846129dc565b6129dc565b9050609c60020a81101561449d576144ad565b6144a681614501565b91506144b9565b6144b6816144bf565b91505b50919050565b600060006144cc836129dc565b9050609d60020a8110156144df576144ef565b6144e88161454b565b91506144fb565b6144f88161458d565b91505b50919050565b60006000614516614511846129dc565b6129dc565b9050609d60020a81101561452957614539565b6145328161458d565b9150614545565b6145428161454b565b91505b50919050565b60006000614558836129dc565b9050609e60020a81101561456b5761457b565b614574816145d7565b9150614587565b61458481614619565b91505b50919050565b600060006145a261459d846129dc565b6129dc565b9050609e60020a8110156145b5576145c5565b6145be81614619565b91506145d1565b6145ce816145d7565b91505b50919050565b600060006145e4836129dc565b9050609f60020a8110156145f757614607565b61460081614663565b9150614613565b614610816146a5565b91505b50919050565b6000600061462e614629846129dc565b6129dc565b9050609f60020a81101561464157614651565b61464a816146a5565b915061465d565b61465a81614663565b91505b50919050565b60006000614670836129dc565b905060a060020a81101561468357614693565b61468c816146ef565b915061469f565b61469c81614731565b91505b50919050565b600060006146ba6146b5846129dc565b6129dc565b905060a060020a8110156146cd576146dd565b6146d681614731565b91506146e9565b6146e6816146ef565b91505b50919050565b600060006146fc836129dc565b905060a160020a81101561470f5761471f565b6147188161477b565b915061472b565b614728816147bd565b91505b50919050565b60006000614746614741846129dc565b6129dc565b905060a160020a81101561475957614769565b614762816147bd565b9150614775565b6147728161477b565b91505b50919050565b60006000614788836129dc565b905060a260020a81101561479b576147ab565b6147a481614807565b91506147b7565b6147b481614849565b91505b50919050565b600060006147d26147cd846129dc565b6129dc565b905060a260020a8110156147e5576147f5565b6147ee81614849565b9150614801565b6147fe81614807565b91505b50919050565b60006000614814836129dc565b905060a360020a81101561482757614837565b61483081614893565b9150614843565b614840816148d5565b91505b50919050565b6000600061485e614859846129dc565b6129dc565b905060a360020a81101561487157614881565b61487a816148d5565b915061488d565b61488a81614893565b91505b50919050565b600060006148a0836129dc565b905060a460020a8110156148b3576148c3565b6148bc8161491f565b91506148cf565b6148cc81614961565b91505b50919050565b600060006148ea6148e5846129dc565b6129dc565b905060a460020a8110156148fd5761490d565b61490681614961565b9150614919565b6149168161491f565b91505b50919050565b6000600061492c836129dc565b905060a560020a81101561493f5761494f565b614948816149ab565b915061495b565b614958816149ed565b91505b50919050565b60006000614976614971846129dc565b6129dc565b905060a560020a81101561498957614999565b614992816149ed565b91506149a5565b6149a2816149ab565b91505b50919050565b600060006149b8836129dc565b905060a660020a8110156149cb576149db565b6149d481614a37565b91506149e7565b6149e481614a79565b91505b50919050565b60006000614a026149fd846129dc565b6129dc565b905060a660020a811015614a1557614a25565b614a1e81614a79565b9150614a31565b614a2e81614a37565b91505b50919050565b60006000614a44836129dc565b905060a760020a811015614a5757614a67565b614a6081614ac3565b9150614a73565b614a7081614b05565b91505b50919050565b60006000614a8e614a89846129dc565b6129dc565b905060a760020a811015614aa157614ab1565b614aaa81614b05565b9150614abd565b614aba81614ac3565b91505b50919050565b60006000614ad0836129dc565b905060a860020a811015614ae357614af3565b614aec81614b4f565b9150614aff565b614afc81614b91565b91505b50919050565b60006000614b1a614b15846129dc565b6129dc565b905060a860020a811015614b2d57614b3d565b614b3681614b91565b9150614b49565b614b4681614b4f565b91505b50919050565b60006000614b5c836129dc565b905060a960020a811015614b6f57614b7f565b614b7881614bdb565b9150614b8b565b614b8881614c1d565b91505b50919050565b60006000614ba6614ba1846129dc565b6129dc565b905060a960020a811015614bb957614bc9565b614bc281614c1d565b9150614bd5565b614bd281614bdb565b91505b50919050565b60006000614be8836129dc565b905060aa60020a811015614bfb57614c0b565b614c0481614c67565b9150614c17565b614c1481614ca9565b91505b50919050565b60006000614c32614c2d846129dc565b6129dc565b905060aa60020a811015614c4557614c55565b614c4e81614ca9565b9150614c61565b614c5e81614c67565b91505b50919050565b60006000614c74836129dc565b905060ab60020a811015614c8757614c97565b614c9081614cf3565b9150614ca3565b614ca081614d35565b91505b50919050565b60006000614cbe614cb9846129dc565b6129dc565b905060ab60020a811015614cd157614ce1565b614cda81614d35565b9150614ced565b614cea81614cf3565b91505b50919050565b60006000614d00836129dc565b905060ac60020a811015614d1357614d23565b614d1c81614d7f565b9150614d2f565b614d2c81614dc1565b91505b50919050565b60006000614d4a614d45846129dc565b6129dc565b905060ac60020a811015614d5d57614d6d565b614d6681614dc1565b9150614d79565b614d7681614d7f565b91505b50919050565b60006000614d8c836129dc565b905060ad60020a811015614d9f57614daf565b614da881614e0b565b9150614dbb565b614db881614e4d565b91505b50919050565b60006000614dd6614dd1846129dc565b6129dc565b905060ad60020a811015614de957614df9565b614df281614e4d565b9150614e05565b614e0281614e0b565b91505b50919050565b60006000614e18836129dc565b905060ae60020a811015614e2b57614e3b565b614e3481614e97565b9150614e47565b614e4481614ed9565b91505b50919050565b60006000614e62614e5d846129dc565b6129dc565b905060ae60020a811015614e7557614e85565b614e7e81614ed9565b9150614e91565b614e8e81614e97565b91505b50919050565b60006000614ea4836129dc565b905060af60020a811015614eb757614ec7565b614ec081614f23565b9150614ed3565b614ed081614f65565b91505b50919050565b60006000614eee614ee9846129dc565b6129dc565b905060af60020a811015614f0157614f11565b614f0a81614f65565b9150614f1d565b614f1a81614f23565b91505b50919050565b60006000614f30836129dc565b905060b060020a811015614f4357614f53565b614f4c81614faf565b9150614f5f565b614f5c81614ff1565b91505b50919050565b60006000614f7a614f75846129dc565b6129dc565b905060b060020a811015614f8d57614f9d565b614f9681614ff1565b9150614fa9565b614fa681614faf565b91505b50919050565b60006000614fbc836129dc565b905060b160020a811015614fcf57614fdf565b614fd881612a11565b9150614feb565b614fe881612a23565b91505b50919050565b60006000615006615001846129dc565b6129dc565b905060b160020a81101561501957615029565b61502281612a23565b9150615035565b61503281612a11565b91505b5091905056",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "//"   : "ManyFunctions.start(1)",
-            "data" : "0x95805DAD0000000000000000000000000000000000000000000000000000000000000001",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmPushDupSwapTest/dup10Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/dup10Filler.json
index 7898a9ef6..6156371d1 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/dup10Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/dup10Filler.json
@@ -1,36 +1,36 @@
 {
     "dup10": {
-        "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" : "0x0a"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x0a"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x600a60096008600760066005600460036002600189600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x600a60096008600760066005600460036002600189600355",
+                "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/vmPushDupSwapTest/dup11Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/dup11Filler.json
index 6637c214e..045987b4f 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/dup11Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/dup11Filler.json
@@ -1,36 +1,36 @@
 {
     "dup11": {
-        "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" : "0x0b"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x0b"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x600b600a6009600860076006600560046003600260018a600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x600b600a6009600860076006600560046003600260018a600355",
+                "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/vmPushDupSwapTest/dup12Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/dup12Filler.json
index bd169b5fb..b38cb9a6a 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/dup12Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/dup12Filler.json
@@ -1,36 +1,36 @@
 {
     "dup12": {
-        "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" : "0x0c"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x0c"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x600c600b600a6009600860076006600560046003600260018b600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x600c600b600a6009600860076006600560046003600260018b600355",
+                "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/vmPushDupSwapTest/dup13Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/dup13Filler.json
index 7b15589e4..17d272528 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/dup13Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/dup13Filler.json
@@ -1,36 +1,36 @@
 {
     "dup13": {
-        "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" : "0x0d"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x0d"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x600d600c600b600a6009600860076006600560046003600260018c600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x600d600c600b600a6009600860076006600560046003600260018c600355",
+                "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/vmPushDupSwapTest/dup14Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/dup14Filler.json
index 70eaf2f25..aff820233 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/dup14Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/dup14Filler.json
@@ -1,36 +1,36 @@
 {
     "dup14": {
-        "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" : "0x0e"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x0e"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x600e600d600c600b600a6009600860076006600560046003600260018d600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x600e600d600c600b600a6009600860076006600560046003600260018d600355",
+                "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/vmPushDupSwapTest/dup15Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/dup15Filler.json
index 2a9237d18..84a9f4f07 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/dup15Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/dup15Filler.json
@@ -1,36 +1,36 @@
 {
     "dup15": {
-        "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" : "0x0f"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x0f"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x600f600e600d600c600b600a6009600860076006600560046003600260018e600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x600f600e600d600c600b600a6009600860076006600560046003600260018e600355",
+                "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/vmPushDupSwapTest/dup16Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/dup16Filler.json
index 8a294775e..b18b091e1 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/dup16Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/dup16Filler.json
@@ -1,36 +1,36 @@
 {
     "dup16": {
-        "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" : "0x10"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x10"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x6010600f600e600d600c600b600a6009600860076006600560046003600260018f600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6010600f600e600d600c600b600a6009600860076006600560046003600260018f600355",
+                "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/vmPushDupSwapTest/dup1Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/dup1Filler.json
index e4a893686..cdaa30b55 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/dup1Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/dup1Filler.json
@@ -1,36 +1,36 @@
 {
     "dup1": {
-        "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" : "0x10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x7f10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff80600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x7f10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff80600355",
+                "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/vmPushDupSwapTest/dup2Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/dup2Filler.json
index 420b58b28..431361a15 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/dup2Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/dup2Filler.json
@@ -1,36 +1,36 @@
 {
     "dup2": {
-        "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" : "0x6002600181600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6002600181600355",
+                "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/vmPushDupSwapTest/dup2errorFiller.json b/src/VMTestsFiller/vmPushDupSwapTest/dup2errorFiller.json
index 9bb893210..5b830bc27 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/dup2errorFiller.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/dup2errorFiller.json
@@ -1,29 +1,29 @@
 {
     "dup2error": {
-        "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" : "0x7f10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff81600355",
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x7f10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff81600355",
+                "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/vmPushDupSwapTest/dup3Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/dup3Filler.json
index 05e23bef0..bf3822dbc 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/dup3Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/dup3Filler.json
@@ -1,36 +1,36 @@
 {
     "dup3": {
-        "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" : "0x03"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x03"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x60036002600182600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x60036002600182600355",
+                "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/vmPushDupSwapTest/dup4Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/dup4Filler.json
index 00167b555..dc2915b1d 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/dup4Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/dup4Filler.json
@@ -1,36 +1,36 @@
 {
     "dup4": {
-        "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" : "0x04"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x04"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x600460036002600183600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x600460036002600183600355",
+                "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/vmPushDupSwapTest/dup5Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/dup5Filler.json
index 249c764f0..9304817ca 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/dup5Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/dup5Filler.json
@@ -1,36 +1,36 @@
 {
     "dup5": {
-        "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" : "0x05"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x05"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x6005600460036002600184600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6005600460036002600184600355",
+                "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/vmPushDupSwapTest/dup6Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/dup6Filler.json
index b0f04b1d9..6a78cbefe 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/dup6Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/dup6Filler.json
@@ -1,36 +1,36 @@
 {
     "dup6": {
-        "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" : "0x06"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x06"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x60066005600460036002600185600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x60066005600460036002600185600355",
+                "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/vmPushDupSwapTest/dup7Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/dup7Filler.json
index d0f37a097..3b3e38f7d 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/dup7Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/dup7Filler.json
@@ -1,36 +1,36 @@
 {
     "dup7": {
-        "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" : "0x07"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x07"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x600760066005600460036002600186600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x600760066005600460036002600186600355",
+                "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/vmPushDupSwapTest/dup8Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/dup8Filler.json
index a764ebdce..751a45117 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/dup8Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/dup8Filler.json
@@ -1,36 +1,36 @@
 {
     "dup8": {
-        "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" : "0x08"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x08"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x6008600760066005600460036002600187600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6008600760066005600460036002600187600355",
+                "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/vmPushDupSwapTest/dup9Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/dup9Filler.json
index 14aaabd36..aa5a1b193 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/dup9Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/dup9Filler.json
@@ -1,36 +1,36 @@
 {
     "dup9": {
-        "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" : "0x09"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x09"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x60096008600760066005600460036002600188600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x60096008600760066005600460036002600188600355",
+                "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/vmPushDupSwapTest/push10Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/push10Filler.json
index ae8d909d0..812aee6d2 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/push10Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/push10Filler.json
@@ -1,36 +1,36 @@
 {
     "push10": {
-        "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" : "0x66778899aabbccddeeff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x66778899aabbccddeeff"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x6966778899aabbccddeeff600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6966778899aabbccddeeff600355",
+                "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/vmPushDupSwapTest/push11Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/push11Filler.json
index 725d07929..739278866 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/push11Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/push11Filler.json
@@ -1,36 +1,36 @@
 {
     "push11": {
-        "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" : "0x5566778899aabbccddeeff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x5566778899aabbccddeeff"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x6a5566778899aabbccddeeff600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6a5566778899aabbccddeeff600355",
+                "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/vmPushDupSwapTest/push12Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/push12Filler.json
index c50ccdcb9..877cf4073 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/push12Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/push12Filler.json
@@ -1,36 +1,36 @@
 {
     "push12": {
-        "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" : "0x445566778899aabbccddeeff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x445566778899aabbccddeeff"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x6b445566778899aabbccddeeff600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6b445566778899aabbccddeeff600355",
+                "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/vmPushDupSwapTest/push13Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/push13Filler.json
index 0b078465d..a6eb7ae3f 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/push13Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/push13Filler.json
@@ -1,36 +1,36 @@
 {
     "push13": {
-        "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" : "0x33445566778899aabbccddeeff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x33445566778899aabbccddeeff"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x6c33445566778899aabbccddeeff600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6c33445566778899aabbccddeeff600355",
+                "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/vmPushDupSwapTest/push14Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/push14Filler.json
index c2e5452b4..24b055a15 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/push14Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/push14Filler.json
@@ -1,36 +1,36 @@
 {
     "push14": {
-        "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" : "0x2233445566778899aabbccddeeff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x2233445566778899aabbccddeeff"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x6d2233445566778899aabbccddeeff600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6d2233445566778899aabbccddeeff600355",
+                "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/vmPushDupSwapTest/push15Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/push15Filler.json
index d8376bea3..ee33995ad 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/push15Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/push15Filler.json
@@ -1,36 +1,36 @@
 {
     "push15": {
-        "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" : "0x112233445566778899aabbccddeeff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x112233445566778899aabbccddeeff"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x6e112233445566778899aabbccddeeff600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6e112233445566778899aabbccddeeff600355",
+                "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/vmPushDupSwapTest/push16Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/push16Filler.json
index c1586e6b0..230e4271e 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/push16Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/push16Filler.json
@@ -1,36 +1,36 @@
 {
     "push16": {
-        "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" : "0x10112233445566778899aabbccddeeff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x10112233445566778899aabbccddeeff"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x6f10112233445566778899aabbccddeeff600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6f10112233445566778899aabbccddeeff600355",
+                "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/vmPushDupSwapTest/push17Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/push17Filler.json
index f02835060..154c9e551 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/push17Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/push17Filler.json
@@ -1,36 +1,36 @@
 {
     "push17": {
-        "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" : "0xff00112233445566778899aabbccddeeff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0xff00112233445566778899aabbccddeeff"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x70ff00112233445566778899aabbccddeeff600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x70ff00112233445566778899aabbccddeeff600355",
+                "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/vmPushDupSwapTest/push18Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/push18Filler.json
index 5c693e857..0d5891c10 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/push18Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/push18Filler.json
@@ -1,36 +1,36 @@
 {
     "push18": {
-        "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" : "0xeeff00112233445566778899aabbccddeeff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0xeeff00112233445566778899aabbccddeeff"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x71eeff00112233445566778899aabbccddeeff600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x71eeff00112233445566778899aabbccddeeff600355",
+                "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/vmPushDupSwapTest/push19Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/push19Filler.json
index eff0b92a7..194fabcfd 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/push19Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/push19Filler.json
@@ -1,36 +1,36 @@
 {
     "push19": {
-        "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" : "0xddeeff00112233445566778899aabbccddeeff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0xddeeff00112233445566778899aabbccddeeff"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x72ddeeff00112233445566778899aabbccddeeff600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x72ddeeff00112233445566778899aabbccddeeff600355",
+                "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/vmPushDupSwapTest/push1Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/push1Filler.json
index aacceb8e5..b3177952c 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/push1Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/push1Filler.json
@@ -1,36 +1,36 @@
 {
     "push1": {
-        "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" : "0xff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0xff"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x60ff600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x60ff600355",
+                "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/vmPushDupSwapTest/push1_missingStackFiller.json b/src/VMTestsFiller/vmPushDupSwapTest/push1_missingStackFiller.json
index 7a07bb35c..97275cc1e 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/push1_missingStackFiller.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/push1_missingStackFiller.json
@@ -1,29 +1,29 @@
 {
     "push1_missingStack": {
-        "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" : "0x60",
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x60",
+                "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/vmPushDupSwapTest/push20Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/push20Filler.json
index e88bccd8d..5795e7a97 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/push20Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/push20Filler.json
@@ -1,36 +1,36 @@
 {
     "push20": {
-        "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" : "0xccddeeff00112233445566778899aabbccddeeff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0xccddeeff00112233445566778899aabbccddeeff"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x73ccddeeff00112233445566778899aabbccddeeff600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x73ccddeeff00112233445566778899aabbccddeeff600355",
+                "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/vmPushDupSwapTest/push21Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/push21Filler.json
index 9c1ceeea3..6ec74af03 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/push21Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/push21Filler.json
@@ -1,36 +1,36 @@
 {
     "push21": {
-        "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" : "0xbbccddeeff00112233445566778899aabbccddeeff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0xbbccddeeff00112233445566778899aabbccddeeff"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x74bbccddeeff00112233445566778899aabbccddeeff600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x74bbccddeeff00112233445566778899aabbccddeeff600355",
+                "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/vmPushDupSwapTest/push22Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/push22Filler.json
index 02d0cef74..1e19a0a67 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/push22Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/push22Filler.json
@@ -1,36 +1,36 @@
 {
     "push22": {
-        "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" : "0xaabbccddeeff00112233445566778899aabbccddeeff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0xaabbccddeeff00112233445566778899aabbccddeeff"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x75aabbccddeeff00112233445566778899aabbccddeeff600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x75aabbccddeeff00112233445566778899aabbccddeeff600355",
+                "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/vmPushDupSwapTest/push23Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/push23Filler.json
index 75c4cf078..b280f1634 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/push23Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/push23Filler.json
@@ -1,36 +1,36 @@
 {
     "push23": {
-        "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" : "0x99aabbccddeeff00112233445566778899aabbccddeeff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x99aabbccddeeff00112233445566778899aabbccddeeff"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x7699aabbccddeeff00112233445566778899aabbccddeeff600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x7699aabbccddeeff00112233445566778899aabbccddeeff600355",
+                "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/vmPushDupSwapTest/push24Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/push24Filler.json
index f6f1e5024..bcfa62274 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/push24Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/push24Filler.json
@@ -1,36 +1,36 @@
 {
     "push24": {
-        "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" : "0x8899aabbccddeeff00112233445566778899aabbccddeeff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x8899aabbccddeeff00112233445566778899aabbccddeeff"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x778899aabbccddeeff00112233445566778899aabbccddeeff600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x778899aabbccddeeff00112233445566778899aabbccddeeff600355",
+                "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/vmPushDupSwapTest/push25Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/push25Filler.json
index 41fd7ca39..eeac5b273 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/push25Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/push25Filler.json
@@ -1,36 +1,36 @@
 {
     "push25": {
-        "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" : "0x778899aabbccddeeff00112233445566778899aabbccddeeff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x778899aabbccddeeff00112233445566778899aabbccddeeff"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x78778899aabbccddeeff00112233445566778899aabbccddeeff600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x78778899aabbccddeeff00112233445566778899aabbccddeeff600355",
+                "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/vmPushDupSwapTest/push26Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/push26Filler.json
index 8a3173eb4..2180e9785 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/push26Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/push26Filler.json
@@ -1,36 +1,36 @@
 {
     "push26": {
-        "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" : "0x66778899aabbccddeeff00112233445566778899aabbccddeeff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x66778899aabbccddeeff00112233445566778899aabbccddeeff"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x7966778899aabbccddeeff00112233445566778899aabbccddeeff600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x7966778899aabbccddeeff00112233445566778899aabbccddeeff600355",
+                "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/vmPushDupSwapTest/push27Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/push27Filler.json
index ae00a17de..0080bcaed 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/push27Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/push27Filler.json
@@ -1,36 +1,36 @@
 {
     "push27": {
-        "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" : "0x5566778899aabbccddeeff00112233445566778899aabbccddeeff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x5566778899aabbccddeeff00112233445566778899aabbccddeeff"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x7a5566778899aabbccddeeff00112233445566778899aabbccddeeff600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x7a5566778899aabbccddeeff00112233445566778899aabbccddeeff600355",
+                "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/vmPushDupSwapTest/push28Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/push28Filler.json
index 2cf464353..235765077 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/push28Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/push28Filler.json
@@ -1,36 +1,36 @@
 {
     "push28": {
-        "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" : "0x445566778899aabbccddeeff00112233445566778899aabbccddeeff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x445566778899aabbccddeeff00112233445566778899aabbccddeeff"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x7b445566778899aabbccddeeff00112233445566778899aabbccddeeff600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x7b445566778899aabbccddeeff00112233445566778899aabbccddeeff600355",
+                "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/vmPushDupSwapTest/push29Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/push29Filler.json
index 64e529b11..465ff171f 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/push29Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/push29Filler.json
@@ -1,36 +1,36 @@
 {
     "push29": {
-        "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" : "0x33445566778899aabbccddeeff00112233445566778899aabbccddeeff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x33445566778899aabbccddeeff00112233445566778899aabbccddeeff"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x7c33445566778899aabbccddeeff00112233445566778899aabbccddeeff600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x7c33445566778899aabbccddeeff00112233445566778899aabbccddeeff600355",
+                "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/vmPushDupSwapTest/push2Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/push2Filler.json
index 2463e6e62..364dd9921 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/push2Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/push2Filler.json
@@ -1,36 +1,36 @@
 {
     "push2": {
-        "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" : "0xeeff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0xeeff"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x61eeff600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x61eeff600355",
+                "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/vmPushDupSwapTest/push30Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/push30Filler.json
index 00ed829d8..dbd3ae70c 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/push30Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/push30Filler.json
@@ -1,36 +1,36 @@
 {
     "push30": {
-        "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" : "0x2233445566778899aabbccddeeff00112233445566778899aabbccddeeff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x2233445566778899aabbccddeeff00112233445566778899aabbccddeeff"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x7d2233445566778899aabbccddeeff00112233445566778899aabbccddeeff600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x7d2233445566778899aabbccddeeff00112233445566778899aabbccddeeff600355",
+                "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/vmPushDupSwapTest/push31Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/push31Filler.json
index 44e54cd75..8490c5633 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/push31Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/push31Filler.json
@@ -1,36 +1,36 @@
 {
     "push31": {
-        "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" : "0x112233445566778899aabbccddeeff00112233445566778899aabbccddeeff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x112233445566778899aabbccddeeff00112233445566778899aabbccddeeff"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x7e112233445566778899aabbccddeeff00112233445566778899aabbccddeeff600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x7e112233445566778899aabbccddeeff00112233445566778899aabbccddeeff600355",
+                "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/vmPushDupSwapTest/push32AndSuicideFiller.json b/src/VMTestsFiller/vmPushDupSwapTest/push32AndSuicideFiller.json
index f4975fc0f..7e92652bf 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/push32AndSuicideFiller.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/push32AndSuicideFiller.json
@@ -1,35 +1,34 @@
 {
     "push32AndSuicide": {
-        "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" : {
-            "bbccddeeff00112233445566778899aabbccddee" : {
-                "storage" : {
-                }
-            }
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x7fff10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff600355",
+        "expect": {
+            "bbccddeeff00112233445566778899aabbccddee": {
                 "storage": {}
             }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x7fff10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff600355",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmPushDupSwapTest/push32FillUpInputWithZerosAtTheEndFiller.json b/src/VMTestsFiller/vmPushDupSwapTest/push32FillUpInputWithZerosAtTheEndFiller.json
index 9def31954..5c060cbac 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/push32FillUpInputWithZerosAtTheEndFiller.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/push32FillUpInputWithZerosAtTheEndFiller.json
@@ -1,35 +1,34 @@
 {
     "push32FillUpInputWithZerosAtTheEnd": {
-        "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" : "0x7fff10112233445566778899aabbccddeeff00112233445566778899aabbccdd",
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
                 "storage": {}
             }
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x7fff10112233445566778899aabbccddeeff00112233445566778899aabbccdd",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmPushDupSwapTest/push32Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/push32Filler.json
index 24776e800..858a5e3d4 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/push32Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/push32Filler.json
@@ -1,36 +1,36 @@
 {
     "push32": {
-        "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" : "0x10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x7f10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x7f10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff600355",
+                "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/vmPushDupSwapTest/push32Undefined2Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/push32Undefined2Filler.json
index d5c670bf1..3c410187b 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/push32Undefined2Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/push32Undefined2Filler.json
@@ -1,29 +1,29 @@
 {
     "push32Undefined2": {
-        "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" : "0x7f0102030000000000000000000000000000000000000000000000000000000000600055",
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x7f0102030000000000000000000000000000000000000000000000000000000000600055",
+                "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/vmPushDupSwapTest/push32Undefined3Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/push32Undefined3Filler.json
index 4c60ec332..7f91395c4 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/push32Undefined3Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/push32Undefined3Filler.json
@@ -1,29 +1,29 @@
 {
     "push32Undefined3": {
-        "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" : "0x7f",
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x7f",
+                "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/vmPushDupSwapTest/push32UndefinedFiller.json b/src/VMTestsFiller/vmPushDupSwapTest/push32UndefinedFiller.json
index e5bfb1156..9e7a3abb2 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/push32UndefinedFiller.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/push32UndefinedFiller.json
@@ -1,29 +1,29 @@
 {
     "push32Undefined": {
-        "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" : "0x7f010203600055",
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x7f010203600055",
+                "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/vmPushDupSwapTest/push33Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/push33Filler.json
index 1c24d0bac..b07979bd0 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/push33Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/push33Filler.json
@@ -1,29 +1,29 @@
 {
     "push33": {
-        "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 101 2002 303303 40444404 50555555505 60666666666606 7777777777777777 888888888888888888 99999999999999999999 10000000000000000000001 10111111111111111111111101 2022222222222222222222222202 303333333333333333333333333303 4044444444444444444444444444444404 505555555555555555555555555555555505 60666666666666666666666666666666666606 7077777777777777777777777777777777777707 808888888888888888888888888888888888888808 90999999999999999999999999999999999999999909 100000000000000000000000000000000000000000000001 10111111111111111111111111111111111111111111111101 2022222222222222222222222222222222222222222222222202 303333333333333333333333333333333333333333333333333303 40444444444444444444444444444444444444444444444444444404 50555555555555555555555555555555555555555555555555555555505 6066666666666666666666666666666666666666666666666666666666606 707777777777777777777777777777777777777777777777777777777777707 808888888888888888888888888888888888888888888888888888888888888808 90999999999999999999999999999999999999999999999999999999999999999909 100000000000000000000000000000000000000000000000000000000000000000000001 10111111111111111111111111111111111111111111111111111111111111111111111101 2022222222222222222222222222222222222222222222222222222222222222222222222202)",
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "32",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "(asm 101 2002 303303 40444404 50555555505 60666666666606 7777777777777777 888888888888888888 99999999999999999999 10000000000000000000001 10111111111111111111111101 2022222222222222222222222202 303333333333333333333333333303 4044444444444444444444444444444404 505555555555555555555555555555555505 60666666666666666666666666666666666606 7077777777777777777777777777777777777707 808888888888888888888888888888888888888808 90999999999999999999999999999999999999999909 100000000000000000000000000000000000000000000001 10111111111111111111111111111111111111111111111101 2022222222222222222222222222222222222222222222222202 303333333333333333333333333333333333333333333333333303 40444444444444444444444444444444444444444444444444444404 50555555555555555555555555555555555555555555555555555555505 6066666666666666666666666666666666666666666666666666666666606 707777777777777777777777777777777777777777777777777777777777707 808888888888888888888888888888888888888888888888888888888888888808 90999999999999999999999999999999999999999999999999999999999999999909 100000000000000000000000000000000000000000000000000000000000000000000001 10111111111111111111111111111111111111111111111111111111111111111111111101 2022222222222222222222222222222222222222222222222222222222222222222222222202)",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "32"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmPushDupSwapTest/push3Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/push3Filler.json
index 077294ae7..93e87b016 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/push3Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/push3Filler.json
@@ -1,36 +1,36 @@
 {
     "push3": {
-        "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" : "0xddeeff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0xddeeff"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x62ddeeff600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x62ddeeff600355",
+                "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/vmPushDupSwapTest/push4Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/push4Filler.json
index 9e59d65b8..8cb2e53a0 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/push4Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/push4Filler.json
@@ -1,36 +1,36 @@
 {
     "push4": {
-        "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" : "0xccddeeff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0xccddeeff"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x63ccddeeff600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x63ccddeeff600355",
+                "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/vmPushDupSwapTest/push5Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/push5Filler.json
index a1ee2f919..5aace57ab 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/push5Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/push5Filler.json
@@ -1,36 +1,36 @@
 {
     "push5": {
-        "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" : "0xbbccddeeff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0xbbccddeeff"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x64bbccddeeff600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x64bbccddeeff600355",
+                "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/vmPushDupSwapTest/push6Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/push6Filler.json
index 5fb735f15..d1a893970 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/push6Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/push6Filler.json
@@ -1,36 +1,36 @@
 {
     "push6": {
-        "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" : "0xaabbccddeeff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0xaabbccddeeff"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x65aabbccddeeff600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x65aabbccddeeff600355",
+                "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/vmPushDupSwapTest/push7Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/push7Filler.json
index f7399830f..cc1e5ce94 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/push7Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/push7Filler.json
@@ -1,36 +1,36 @@
 {
     "push7": {
-        "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" : "0x99aabbccddeeff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x99aabbccddeeff"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x6699aabbccddeeff600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6699aabbccddeeff600355",
+                "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/vmPushDupSwapTest/push8Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/push8Filler.json
index b2cc076ae..aa56577f8 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/push8Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/push8Filler.json
@@ -1,36 +1,36 @@
 {
     "push8": {
-        "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" : "0x8899aabbccddeeff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x8899aabbccddeeff"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x678899aabbccddeeff600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x678899aabbccddeeff600355",
+                "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/vmPushDupSwapTest/push9Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/push9Filler.json
index 65d31eba0..1c584cf1b 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/push9Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/push9Filler.json
@@ -1,36 +1,36 @@
 {
     "push9": {
-        "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" : "0x778899aabbccddeeff"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x778899aabbccddeeff"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x68778899aabbccddeeff600355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x68778899aabbccddeeff600355",
+                "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/vmPushDupSwapTest/swap10Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/swap10Filler.json
index c1b0adbfb..4e96cbe57 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/swap10Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/swap10Filler.json
@@ -1,36 +1,36 @@
 {
     "swap10": {
-        "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" : {
-                    "0x0a" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x0a": "0x01"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x600a60096008600760066005600460036002600160039955",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x600a60096008600760066005600460036002600160039955",
+                "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/vmPushDupSwapTest/swap11Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/swap11Filler.json
index 47818861b..e79cfdd26 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/swap11Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/swap11Filler.json
@@ -1,36 +1,36 @@
 {
     "swap11": {
-        "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" : {
-                    "0x0b" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x0b": "0x01"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x600b600a60096008600760066005600460036002600160039a55",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x600b600a60096008600760066005600460036002600160039a55",
+                "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/vmPushDupSwapTest/swap12Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/swap12Filler.json
index 6e008ba36..b1adb6a10 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/swap12Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/swap12Filler.json
@@ -1,36 +1,36 @@
 {
     "swap12": {
-        "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" : {
-                    "0x0c" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x0c": "0x01"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x600c600b600a60096008600760066005600460036002600160039b55",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x600c600b600a60096008600760066005600460036002600160039b55",
+                "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/vmPushDupSwapTest/swap13Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/swap13Filler.json
index 8f0466366..f1c92b3d5 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/swap13Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/swap13Filler.json
@@ -1,36 +1,36 @@
 {
     "swap13": {
-        "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" : {
-                    "0x0d" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x0d": "0x01"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x600d600c600b600a60096008600760066005600460036002600160039c55",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x600d600c600b600a60096008600760066005600460036002600160039c55",
+                "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/vmPushDupSwapTest/swap14Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/swap14Filler.json
index 74e2526ef..1975a2425 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/swap14Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/swap14Filler.json
@@ -1,36 +1,36 @@
 {
     "swap14": {
-        "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" : {
-                    "0x0e" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x0e": "0x01"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x600e600d600c600b600a60096008600760066005600460036002600160039d55",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x600e600d600c600b600a60096008600760066005600460036002600160039d55",
+                "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/vmPushDupSwapTest/swap15Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/swap15Filler.json
index 215d68b5a..79f17081f 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/swap15Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/swap15Filler.json
@@ -1,36 +1,36 @@
 {
     "swap15": {
-        "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" : {
-                    "0x0f" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x0f": "0x01"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x600f600e600d600c600b600a60096008600760066005600460036002600160039e55",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x600f600e600d600c600b600a60096008600760066005600460036002600160039e55",
+                "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/vmPushDupSwapTest/swap16Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/swap16Filler.json
index afe633247..caf2237af 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/swap16Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/swap16Filler.json
@@ -1,36 +1,36 @@
 {
     "swap16": {
-        "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" : {
-                    "0x10" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x10": "0x01"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x6010600f600e600d600c600b600a60096008600760066005600460036002600160039f55",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6010600f600e600d600c600b600a60096008600760066005600460036002600160039f55",
+                "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/vmPushDupSwapTest/swap1Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/swap1Filler.json
index 89d2ffdd9..4da420ac0 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/swap1Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/swap1Filler.json
@@ -1,36 +1,36 @@
 {
     "swap1": {
-        "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" : {
-                    "0x10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff" : "0x03"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff": "0x03"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x7f10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff60039055",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x7f10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff60039055",
+                "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/vmPushDupSwapTest/swap2Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/swap2Filler.json
index 5ccf1fd29..8071cbd50 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/swap2Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/swap2Filler.json
@@ -1,36 +1,36 @@
 {
     "swap2": {
-        "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" : "0x6002600160039155",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6002600160039155",
+                "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/vmPushDupSwapTest/swap2errorFiller.json b/src/VMTestsFiller/vmPushDupSwapTest/swap2errorFiller.json
index b86479a76..f9a20cc57 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/swap2errorFiller.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/swap2errorFiller.json
@@ -1,29 +1,29 @@
 {
     "swap2error": {
-        "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" : "0x7f10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff60039155",
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x7f10112233445566778899aabbccddeeff00112233445566778899aabbccddeeff60039155",
+                "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/vmPushDupSwapTest/swap3Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/swap3Filler.json
index 01b7d9d6a..cfe31e1bb 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/swap3Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/swap3Filler.json
@@ -1,36 +1,36 @@
 {
     "swap3": {
-        "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" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x03": "0x01"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x60036002600160039255",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x60036002600160039255",
+                "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/vmPushDupSwapTest/swap4Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/swap4Filler.json
index 48e97e066..1a6b9bd24 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/swap4Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/swap4Filler.json
@@ -1,36 +1,36 @@
 {
     "swap4": {
-        "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" : {
-                    "0x04" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x04": "0x01"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x600460036002600160039355",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x600460036002600160039355",
+                "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/vmPushDupSwapTest/swap5Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/swap5Filler.json
index 9d98854b5..40e2e3f83 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/swap5Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/swap5Filler.json
@@ -1,36 +1,36 @@
 {
     "swap5": {
-        "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" : {
-                    "0x05" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x05": "0x01"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x6005600460036002600160039455",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6005600460036002600160039455",
+                "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/vmPushDupSwapTest/swap6Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/swap6Filler.json
index 629deb91a..5aff309c4 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/swap6Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/swap6Filler.json
@@ -1,36 +1,36 @@
 {
     "swap6": {
-        "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" : {
-                    "0x06" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x06": "0x01"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x60066005600460036002600160039555",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x60066005600460036002600160039555",
+                "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/vmPushDupSwapTest/swap7Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/swap7Filler.json
index a07266f0f..c9311122c 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/swap7Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/swap7Filler.json
@@ -1,36 +1,36 @@
 {
     "swap7": {
-        "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" : {
-                    "0x07" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x07": "0x01"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x600760066005600460036002600160039655",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x600760066005600460036002600160039655",
+                "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/vmPushDupSwapTest/swap8Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/swap8Filler.json
index 0ca9737d6..3aaf5d038 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/swap8Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/swap8Filler.json
@@ -1,36 +1,36 @@
 {
     "swap8": {
-        "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" : {
-                    "0x08" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x08": "0x01"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x6008600760066005600460036002600160039755",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6008600760066005600460036002600160039755",
+                "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/vmPushDupSwapTest/swap9Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/swap9Filler.json
index 4478815e0..6c3b2a774 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/swap9Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/swap9Filler.json
@@ -1,36 +1,36 @@
 {
     "swap9": {
-        "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" : {
-                    "0x09" : "0x01"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x09": "0x01"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x60096008600760066005600460036002600160039855",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x60096008600760066005600460036002600160039855",
+                "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/vmPushDupSwapTest/swapjump1Filler.json b/src/VMTestsFiller/vmPushDupSwapTest/swapjump1Filler.json
index 0a021784c..62b7a03b4 100644
--- a/src/VMTestsFiller/vmPushDupSwapTest/swapjump1Filler.json
+++ b/src/VMTestsFiller/vmPushDupSwapTest/swapjump1Filler.json
@@ -1,30 +1,30 @@
 {
     "swapjump1": {
-        "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 5 2 1 12 JUMPI POP POP STOP JUMPDEST SWAP1 1 22 JUMPI POP POP STOP JUMPDEST SUB 0 MSTORE 1 31 RETURN)",
-                "code" : "0x600560026001600c575050005b9060016116575050005b035b0360005260016003611ff3",
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "_code": "(asm 5 2 1 12 JUMPI POP POP STOP JUMPDEST SWAP1 1 22 JUMPI POP POP STOP JUMPDEST SUB 0 MSTORE 1 31 RETURN)",
+                "balance": "100000000000000000000000",
+                "code": "0x600560026001600c575050005b9060016116575050005b035b0360005260016003611ff3",
+                "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/vmRandomTest/201503102320PYTHONFiller.json b/src/VMTestsFiller/vmRandomTest/201503102320PYTHONFiller.json
index fd81dffa6..c25bf5336 100644
--- a/src/VMTestsFiller/vmRandomTest/201503102320PYTHONFiller.json
+++ b/src/VMTestsFiller/vmRandomTest/201503102320PYTHONFiller.json
@@ -1,31 +1,30 @@
 {
-    "201503102320PYTHON" : {
-        "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
-            "currentGasLimit" : "1000000",
-            "currentNumber" : "300",
-            "currentTimestamp" : "2",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+    "201503102320PYTHON": {
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "115792089237316195423570985008687907853269984665640564039457584007913129639935",
+            "currentGasLimit": "1000000",
+            "currentNumber": "300",
+            "currentTimestamp": "2",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "code" : "0x434342444244454597",
-            "data" : "0x",
-            "gas" : "10000",
-            "gasPrice" : "100000000000000",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "code": "0x434342444244454597",
+            "data": "0x",
+            "gas": "10000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "code" : "0x434342444244454597",
-                "nonce" : "0",
-                "storage" : {
-                }
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "0x434342444244454597",
+                "nonce": "0",
+                "storage": {}
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmRandomTest/201503110206PYTHONFiller.json b/src/VMTestsFiller/vmRandomTest/201503110206PYTHONFiller.json
index 576833498..38e55b954 100644
--- a/src/VMTestsFiller/vmRandomTest/201503110206PYTHONFiller.json
+++ b/src/VMTestsFiller/vmRandomTest/201503110206PYTHONFiller.json
@@ -1,31 +1,30 @@
 {
-    "201503110206PYTHON" : {
-        "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
-            "currentGasLimit" : "1000000",
-            "currentNumber" : "300",
-            "currentTimestamp" : "2",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+    "201503110206PYTHON": {
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "115792089237316195423570985008687907853269984665640564039457584007913129639935",
+            "currentGasLimit": "1000000",
+            "currentNumber": "300",
+            "currentTimestamp": "2",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "code" : "0x4045404145454441343987ff3735043055",
-            "data" : "0x",
-            "gas" : "10000",
-            "gasPrice" : "100000000000000",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "code": "0x4045404145454441343987ff3735043055",
+            "data": "0x",
+            "gas": "10000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "code" : "0x4045404145454441343987ff3735043055",
-                "nonce" : "0",
-                "storage" : {
-                }
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "0x4045404145454441343987ff3735043055",
+                "nonce": "0",
+                "storage": {}
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmRandomTest/201503110219PYTHONFiller.json b/src/VMTestsFiller/vmRandomTest/201503110219PYTHONFiller.json
index f684092a5..2ac7d679c 100644
--- a/src/VMTestsFiller/vmRandomTest/201503110219PYTHONFiller.json
+++ b/src/VMTestsFiller/vmRandomTest/201503110219PYTHONFiller.json
@@ -1,31 +1,30 @@
 {
-    "201503110219PYTHON" : {
-        "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
-            "currentGasLimit" : "1000000",
-            "currentNumber" : "300",
-            "currentTimestamp" : "2",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+    "201503110219PYTHON": {
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "115792089237316195423570985008687907853269984665640564039457584007913129639935",
+            "currentGasLimit": "1000000",
+            "currentNumber": "300",
+            "currentTimestamp": "2",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "code" : "0x4040459143404144809759886d608f",
-            "data" : "0x",
-            "gas" : "10000",
-            "gasPrice" : "100000000000000",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "code": "0x4040459143404144809759886d608f",
+            "data": "0x",
+            "gas": "10000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "code" : "0x4040459143404144809759886d608f",
-                "nonce" : "0",
-                "storage" : {
-                }
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "0x4040459143404144809759886d608f",
+                "nonce": "0",
+                "storage": {}
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmRandomTest/201503110346PYTHON_PUSH24Filler.json b/src/VMTestsFiller/vmRandomTest/201503110346PYTHON_PUSH24Filler.json
index 9af6b4cd6..69364ac34 100644
--- a/src/VMTestsFiller/vmRandomTest/201503110346PYTHON_PUSH24Filler.json
+++ b/src/VMTestsFiller/vmRandomTest/201503110346PYTHON_PUSH24Filler.json
@@ -1,40 +1,38 @@
 {
-    "201503110346PYTHON_PUSH24" : {
-        "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
-            "currentGasLimit" : "1000000",
-            "currentNumber" : "300",
-            "currentTimestamp" : "2",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+    "201503110346PYTHON_PUSH24": {
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "115792089237316195423570985008687907853269984665640564039457584007913129639935",
+            "currentGasLimit": "1000000",
+            "currentNumber": "300",
+            "currentTimestamp": "2",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "code" : "0x7745414245403745f31387900a8d55",
-            "data" : "0x",
-            "gas" : "10000",
-            "gasPrice" : "100000000000000",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "code": "0x7745414245403745f31387900a8d55",
+            "data": "0x",
+            "gas": "10000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "code" : "0x7745414245403745f31387900a8d55",
-                "nonce" : "0",
-                "storage" : {
-                }
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "0x7745414245403745f31387900a8d55",
+                "nonce": "0",
+                "storage": {}
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "code" : "0x7745414245403745f31387900a8d55",
-                "nonce" : "0",
-                "storage" : {
-                }
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "0x7745414245403745f31387900a8d55",
+                "nonce": "0",
+                "storage": {}
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmRandomTest/201503111844PYTHONFiller.json b/src/VMTestsFiller/vmRandomTest/201503111844PYTHONFiller.json
index d41ab9ab3..b77696aea 100644
--- a/src/VMTestsFiller/vmRandomTest/201503111844PYTHONFiller.json
+++ b/src/VMTestsFiller/vmRandomTest/201503111844PYTHONFiller.json
@@ -1,40 +1,38 @@
 {
-    "201503111844PYTHON" : {
-        "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
-            "currentGasLimit" : "1000000",
-            "currentNumber" : "300",
-            "currentTimestamp" : "2",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+    "201503111844PYTHON": {
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "115792089237316195423570985008687907853269984665640564039457584007913129639935",
+            "currentGasLimit": "1000000",
+            "currentNumber": "300",
+            "currentTimestamp": "2",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "code" : "0x65424555",
-            "data" : "0x",
-            "gas" : "10000",
-            "gasPrice" : "100000000000000",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "code": "0x65424555",
+            "data": "0x",
+            "gas": "10000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "code" : "0x65424555",
-                "nonce" : "0",
-                "storage" : {
-                }
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "0x65424555",
+                "nonce": "0",
+                "storage": {}
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "code" : "0x65424555",
-                "nonce" : "0",
-                "storage" : {
-                }
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "0x65424555",
+                "nonce": "0",
+                "storage": {}
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmRandomTest/201503112218PYTHONFiller.json b/src/VMTestsFiller/vmRandomTest/201503112218PYTHONFiller.json
index a29777ebd..21cf2ee71 100644
--- a/src/VMTestsFiller/vmRandomTest/201503112218PYTHONFiller.json
+++ b/src/VMTestsFiller/vmRandomTest/201503112218PYTHONFiller.json
@@ -1,31 +1,30 @@
 {
-    "201503112218PYTHON" : {
-        "env" : {
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "currentDifficulty" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
-            "currentGasLimit" : "1000000",
-            "currentNumber" : "300",
-            "currentTimestamp" : "2",
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+    "201503112218PYTHON": {
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "115792089237316195423570985008687907853269984665640564039457584007913129639935",
+            "currentGasLimit": "1000000",
+            "currentNumber": "300",
+            "currentTimestamp": "2",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "code" : "0x4041",
-            "data" : "0x",
-            "gas" : "10000",
-            "gasPrice" : "100000000000000",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "code": "0x4041",
+            "data": "0x",
+            "gas": "10000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "1000000000000000000",
-                "code" : "0x4041",
-                "nonce" : "0",
-                "storage" : {
-                }
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "1000000000000000000",
+                "code": "0x4041",
+                "nonce": "0",
+                "storage": {}
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmSha3Test/sha3_0Filler.json b/src/VMTestsFiller/vmSha3Test/sha3_0Filler.json
index b569b59c1..733a865ee 100644
--- a/src/VMTestsFiller/vmSha3Test/sha3_0Filler.json
+++ b/src/VMTestsFiller/vmSha3Test/sha3_0Filler.json
@@ -1,36 +1,36 @@
 {
     "sha3_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" : "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000000000",
+            "gasPrice": "1000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (KECCAK256 0 0)}",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ [[ 0 ]] (KECCAK256 0 0)}",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "",
-            "gasPrice" : "1000000000",
-            "gas" : "100000000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmSha3Test/sha3_1Filler.json b/src/VMTestsFiller/vmSha3Test/sha3_1Filler.json
index e70fc68a8..fa52d1f76 100644
--- a/src/VMTestsFiller/vmSha3Test/sha3_1Filler.json
+++ b/src/VMTestsFiller/vmSha3Test/sha3_1Filler.json
@@ -1,36 +1,36 @@
 {
     "sha3_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" : "0xc41589e7559804ea4a2080dad19d876a024ccb05117835447d72ce08c1d020ec"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xc41589e7559804ea4a2080dad19d876a024ccb05117835447d72ce08c1d020ec"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (KECCAK256 4 5)}",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ [[ 0 ]] (KECCAK256 4 5)}",
+                "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/vmSha3Test/sha3_2Filler.json b/src/VMTestsFiller/vmSha3Test/sha3_2Filler.json
index 3956dc817..e6e235af3 100644
--- a/src/VMTestsFiller/vmSha3Test/sha3_2Filler.json
+++ b/src/VMTestsFiller/vmSha3Test/sha3_2Filler.json
@@ -1,36 +1,36 @@
 {
     "sha3_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"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x" : "0x6bd2dd6bd408cbee33429358bf24fdc64612fbf8b1b4db604518f40ffd34b607"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x6bd2dd6bd408cbee33429358bf24fdc64612fbf8b1b4db604518f40ffd34b607"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (KECCAK256 10 10)}",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ [[ 0 ]] (KECCAK256 10 10)}",
+                "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/vmSha3Test/sha3_3Filler.json b/src/VMTestsFiller/vmSha3Test/sha3_3Filler.json
index 9475f578c..f9991211c 100644
--- a/src/VMTestsFiller/vmSha3Test/sha3_3Filler.json
+++ b/src/VMTestsFiller/vmSha3Test/sha3_3Filler.json
@@ -1,29 +1,29 @@
 {
     "sha3_3": {
-        "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" : "{ [[ 0 ]] (KECCAK256 1000 0xfffff)}",
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ [[ 0 ]] (KECCAK256 1000 0xfffff)}",
+                "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/vmSha3Test/sha3_4Filler.json b/src/VMTestsFiller/vmSha3Test/sha3_4Filler.json
index e3e1d8fc4..f59fbec96 100644
--- a/src/VMTestsFiller/vmSha3Test/sha3_4Filler.json
+++ b/src/VMTestsFiller/vmSha3Test/sha3_4Filler.json
@@ -1,29 +1,29 @@
 {
     "sha3_4": {
-        "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" : "{ [[ 0 ]] (KECCAK256  0xfffffffff 100)}",
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ [[ 0 ]] (KECCAK256  0xfffffffff 100)}",
+                "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/vmSha3Test/sha3_5Filler.json b/src/VMTestsFiller/vmSha3Test/sha3_5Filler.json
index 55e6aaae1..9d97e60f6 100644
--- a/src/VMTestsFiller/vmSha3Test/sha3_5Filler.json
+++ b/src/VMTestsFiller/vmSha3Test/sha3_5Filler.json
@@ -1,29 +1,29 @@
 {
     "sha3_5": {
-        "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" : "{ [[ 0 ]] (KECCAK256 10000 0xfffffffff )}",
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ [[ 0 ]] (KECCAK256 10000 0xfffffffff )}",
+                "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/vmSha3Test/sha3_6Filler.json b/src/VMTestsFiller/vmSha3Test/sha3_6Filler.json
index 103ac2315..033a33833 100644
--- a/src/VMTestsFiller/vmSha3Test/sha3_6Filler.json
+++ b/src/VMTestsFiller/vmSha3Test/sha3_6Filler.json
@@ -1,29 +1,29 @@
 {
     "sha3_6": {
-        "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" : "{ [[ 0 ]] (KECCAK256 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)}",
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ [[ 0 ]] (KECCAK256 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)}",
+                "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/vmSha3Test/sha3_bigOffset2Filler.json b/src/VMTestsFiller/vmSha3Test/sha3_bigOffset2Filler.json
index 9a5af6f92..f39141faf 100644
--- a/src/VMTestsFiller/vmSha3Test/sha3_bigOffset2Filler.json
+++ b/src/VMTestsFiller/vmSha3Test/sha3_bigOffset2Filler.json
@@ -1,36 +1,36 @@
 {
     "sha3_bigOffset2": {
-        "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" : "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "0x100000000",
+            "gasPrice": "1",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x54a8c0ab653c15bfb48b47fd011ba2b9617af01cb45cab344acd57c924d56798"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (KECCAK256 0x1000000 2)}",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "code": "{ [[ 0 ]] (KECCAK256 0x1000000 2)}",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-            "data" : "",
-            "gasPrice" : "1",
-            "gas" : "0x100000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmSha3Test/sha3_bigOffsetFiller.json b/src/VMTestsFiller/vmSha3Test/sha3_bigOffsetFiller.json
index eaab3ed94..310ab8e4e 100644
--- a/src/VMTestsFiller/vmSha3Test/sha3_bigOffsetFiller.json
+++ b/src/VMTestsFiller/vmSha3Test/sha3_bigOffsetFiller.json
@@ -1,29 +1,29 @@
 {
     "sha3_bigOffset": {
-        "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" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (KECCAK256 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 2)}",
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "0x10000000000",
+            "gasPrice": "1",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "code": "{ [[ 0 ]] (KECCAK256 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 2)}",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-            "data" : "",
-            "gasPrice" : "1",
-            "gas" : "0x10000000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmSha3Test/sha3_bigSizeFiller.json b/src/VMTestsFiller/vmSha3Test/sha3_bigSizeFiller.json
index 7b0dd1b3c..401e9be8e 100644
--- a/src/VMTestsFiller/vmSha3Test/sha3_bigSizeFiller.json
+++ b/src/VMTestsFiller/vmSha3Test/sha3_bigSizeFiller.json
@@ -1,29 +1,29 @@
 {
     "sha3_bigSize": {
-        "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" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (KECCAK256 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)}",
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "0x10000000000",
+            "gasPrice": "1",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "code": "{ [[ 0 ]] (KECCAK256 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)}",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-            "data" : "",
-            "gasPrice" : "1",
-            "gas" : "0x10000000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmSha3Test/sha3_memSizeNoQuadraticCost31Filler.json b/src/VMTestsFiller/vmSha3Test/sha3_memSizeNoQuadraticCost31Filler.json
index b07f0e7fc..ff669f7e3 100644
--- a/src/VMTestsFiller/vmSha3Test/sha3_memSizeNoQuadraticCost31Filler.json
+++ b/src/VMTestsFiller/vmSha3Test/sha3_memSizeNoQuadraticCost31Filler.json
@@ -1,36 +1,36 @@
 {
     "sha3_memSizeNoQuadraticCost31": {
-        "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" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "0x100000000",
+            "gasPrice": "1",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (KECCAK256 960 1)}",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "code": "{ [[ 0 ]] (KECCAK256 960 1)}",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-            "data" : "",
-            "gasPrice" : "1",
-            "gas" : "0x100000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmSha3Test/sha3_memSizeQuadraticCost32Filler.json b/src/VMTestsFiller/vmSha3Test/sha3_memSizeQuadraticCost32Filler.json
index 3979aa389..c78d65c16 100644
--- a/src/VMTestsFiller/vmSha3Test/sha3_memSizeQuadraticCost32Filler.json
+++ b/src/VMTestsFiller/vmSha3Test/sha3_memSizeQuadraticCost32Filler.json
@@ -1,36 +1,36 @@
 {
     "sha3_memSizeQuadraticCost32": {
-        "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" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "0x100000000",
+            "gasPrice": "1",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (KECCAK256 992 1)}",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "code": "{ [[ 0 ]] (KECCAK256 992 1)}",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-            "data" : "",
-            "gasPrice" : "1",
-            "gas" : "0x100000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmSha3Test/sha3_memSizeQuadraticCost32_zeroSizeFiller.json b/src/VMTestsFiller/vmSha3Test/sha3_memSizeQuadraticCost32_zeroSizeFiller.json
index aa52c8f24..6173274fb 100644
--- a/src/VMTestsFiller/vmSha3Test/sha3_memSizeQuadraticCost32_zeroSizeFiller.json
+++ b/src/VMTestsFiller/vmSha3Test/sha3_memSizeQuadraticCost32_zeroSizeFiller.json
@@ -1,36 +1,36 @@
 {
     "sha3_memSizeQuadraticCost32_zeroSize": {
-        "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" : "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "0x100000000",
+            "gasPrice": "1",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (KECCAK256 1024 0)}",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "code": "{ [[ 0 ]] (KECCAK256 1024 0)}",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-            "data" : "",
-            "gasPrice" : "1",
-            "gas" : "0x100000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmSha3Test/sha3_memSizeQuadraticCost33Filler.json b/src/VMTestsFiller/vmSha3Test/sha3_memSizeQuadraticCost33Filler.json
index 93d4e1d85..6f869df0d 100644
--- a/src/VMTestsFiller/vmSha3Test/sha3_memSizeQuadraticCost33Filler.json
+++ b/src/VMTestsFiller/vmSha3Test/sha3_memSizeQuadraticCost33Filler.json
@@ -1,36 +1,36 @@
 {
     "sha3_memSizeQuadraticCost33": {
-        "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" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "0x100000000",
+            "gasPrice": "1",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (KECCAK256 1024 1)}",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "code": "{ [[ 0 ]] (KECCAK256 1024 1)}",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-            "data" : "",
-            "gasPrice" : "1",
-            "gas" : "0x100000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmSha3Test/sha3_memSizeQuadraticCost63Filler.json b/src/VMTestsFiller/vmSha3Test/sha3_memSizeQuadraticCost63Filler.json
index 5378200cc..9fa2aad1e 100644
--- a/src/VMTestsFiller/vmSha3Test/sha3_memSizeQuadraticCost63Filler.json
+++ b/src/VMTestsFiller/vmSha3Test/sha3_memSizeQuadraticCost63Filler.json
@@ -1,36 +1,36 @@
 {
     "sha3_memSizeQuadraticCost63": {
-        "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" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "0x100000000",
+            "gasPrice": "1",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (KECCAK256 1984 1)}",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "code": "{ [[ 0 ]] (KECCAK256 1984 1)}",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-            "data" : "",
-            "gasPrice" : "1",
-            "gas" : "0x100000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmSha3Test/sha3_memSizeQuadraticCost64Filler.json b/src/VMTestsFiller/vmSha3Test/sha3_memSizeQuadraticCost64Filler.json
index d6c1c132e..0e4d3a780 100644
--- a/src/VMTestsFiller/vmSha3Test/sha3_memSizeQuadraticCost64Filler.json
+++ b/src/VMTestsFiller/vmSha3Test/sha3_memSizeQuadraticCost64Filler.json
@@ -1,36 +1,36 @@
 {
     "sha3_memSizeQuadraticCost64": {
-        "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" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "0x100000000",
+            "gasPrice": "1",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (KECCAK256 2016 1)}",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "code": "{ [[ 0 ]] (KECCAK256 2016 1)}",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-            "data" : "",
-            "gasPrice" : "1",
-            "gas" : "0x100000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmSha3Test/sha3_memSizeQuadraticCost64_2Filler.json b/src/VMTestsFiller/vmSha3Test/sha3_memSizeQuadraticCost64_2Filler.json
index 5b129bc69..c26c53f3f 100644
--- a/src/VMTestsFiller/vmSha3Test/sha3_memSizeQuadraticCost64_2Filler.json
+++ b/src/VMTestsFiller/vmSha3Test/sha3_memSizeQuadraticCost64_2Filler.json
@@ -1,36 +1,36 @@
 {
     "sha3_memSizeQuadraticCost64_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"
         },
-        "expect" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "storage" : {
-                    "0x" : "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "0x100000000",
+            "gasPrice": "1",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (KECCAK256 2016 32)}",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "code": "{ [[ 0 ]] (KECCAK256 2016 32)}",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-            "data" : "",
-            "gasPrice" : "1",
-            "gas" : "0x100000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmSha3Test/sha3_memSizeQuadraticCost65Filler.json b/src/VMTestsFiller/vmSha3Test/sha3_memSizeQuadraticCost65Filler.json
index cdda292b3..1a3610e76 100644
--- a/src/VMTestsFiller/vmSha3Test/sha3_memSizeQuadraticCost65Filler.json
+++ b/src/VMTestsFiller/vmSha3Test/sha3_memSizeQuadraticCost65Filler.json
@@ -1,36 +1,36 @@
 {
     "sha3_memSizeQuadraticCost65": {
-        "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" : "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "0x100000000",
+            "gasPrice": "1",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0x": "0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-                "nonce" : "0",
-                "code" : "{ [[ 0 ]] (KECCAK256 2048 1)}",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                "code": "{ [[ 0 ]] (KECCAK256 2048 1)}",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-            "data" : "",
-            "gasPrice" : "1",
-            "gas" : "0x100000000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmSystemOperations/TestNameRegistratorFiller.json b/src/VMTestsFiller/vmSystemOperations/TestNameRegistratorFiller.json
index 67a6e8d33..e089c573e 100644
--- a/src/VMTestsFiller/vmSystemOperations/TestNameRegistratorFiller.json
+++ b/src/VMTestsFiller/vmSystemOperations/TestNameRegistratorFiller.json
@@ -1,36 +1,36 @@
 {
     "TestNameRegistrator": {
-        "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" : {
-                    "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffafffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "expect": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "storage": {
+                    "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa": "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa"
                 }
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "0x6000355415600957005b60203560003555",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "0x6000355415600957005b60203560003555",
+                "nonce": "0",
                 "storage": {}
             }
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "1000000000000000000",
-            "data" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffafffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmSystemOperations/return0Filler.json b/src/VMTestsFiller/vmSystemOperations/return0Filler.json
index cffdc9393..e000d823d 100644
--- a/src/VMTestsFiller/vmSystemOperations/return0Filler.json
+++ b/src/VMTestsFiller/vmSystemOperations/return0Filler.json
@@ -1,38 +1,36 @@
 {
     "return0": {
-        "env" : {
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-            "currentNumber" : "0",
-            "currentGasLimit" : "10000000",
-            "currentDifficulty" : "256",
-            "currentTimestamp" : "1",
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "cd1722f3947def4cf144679da39c4c32bdc35681" : {
-                "storage" : {
- 		     "0x" : "0x3700000000000000000000000000000000000000000000000000000000000000"
-                }
-            }
+        "exec": {
+            "address": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "data": "0xaa",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "value": "23"
         },
-        "pre" : {
-           "cd1722f3947def4cf144679da39c4c32bdc35681" : {
-                "balance" : "23",
-                "code" : "{ (MSTORE8 0 55) [[0]](MLOAD 0) (RETURN 0 1)}",
-                "nonce" : "0",
-                "storage" : {
+        "expect": {
+            "cd1722f3947def4cf144679da39c4c32bdc35681": {
+                "storage": {
+                    "0x": "0x3700000000000000000000000000000000000000000000000000000000000000"
                 }
             }
-
         },
-        "exec" : {
-            "address" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "origin" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "caller" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "value" : "23",
-            "data" : "0xaa",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "cd1722f3947def4cf144679da39c4c32bdc35681": {
+                "balance": "23",
+                "code": "{ (MSTORE8 0 55) [[0]](MLOAD 0) (RETURN 0 1)}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmSystemOperations/return1Filler.json b/src/VMTestsFiller/vmSystemOperations/return1Filler.json
index 4d82c7f5f..61e746481 100644
--- a/src/VMTestsFiller/vmSystemOperations/return1Filler.json
+++ b/src/VMTestsFiller/vmSystemOperations/return1Filler.json
@@ -1,38 +1,36 @@
 {
     "return1": {
-        "env" : {
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-            "currentNumber" : "0",
-            "currentGasLimit" : "10000000",
-            "currentDifficulty" : "256",
-            "currentTimestamp" : "1",
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "cd1722f3947def4cf144679da39c4c32bdc35681" : {
-                "storage" : {
-                    "0x" : "0x3700000000000000000000000000000000000000000000000000000000000000"
-                }
-            }
+        "exec": {
+            "address": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "data": "0xaa",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "value": "23"
         },
-        "pre" : {
-           "cd1722f3947def4cf144679da39c4c32bdc35681" : {
-                "balance" : "23",
-                "code" : "{ (MSTORE8 0 55) [[0]](MLOAD 0) (RETURN 0 2)}",
-                "nonce" : "0",
-                "storage" : {
+        "expect": {
+            "cd1722f3947def4cf144679da39c4c32bdc35681": {
+                "storage": {
+                    "0x": "0x3700000000000000000000000000000000000000000000000000000000000000"
                 }
             }
-
         },
-        "exec" : {
-            "address" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "origin" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "caller" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "value" : "23",
-            "data" : "0xaa",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "cd1722f3947def4cf144679da39c4c32bdc35681": {
+                "balance": "23",
+                "code": "{ (MSTORE8 0 55) [[0]](MLOAD 0) (RETURN 0 2)}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmSystemOperations/return2Filler.json b/src/VMTestsFiller/vmSystemOperations/return2Filler.json
index d1f889199..c9f79ecb5 100644
--- a/src/VMTestsFiller/vmSystemOperations/return2Filler.json
+++ b/src/VMTestsFiller/vmSystemOperations/return2Filler.json
@@ -1,38 +1,36 @@
 {
     "return2": {
-        "env" : {
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-            "currentNumber" : "0",
-            "currentGasLimit" : "10000000",
-            "currentDifficulty" : "256",
-            "currentTimestamp" : "1",
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "cd1722f3947def4cf144679da39c4c32bdc35681" : {
-                "storage" : {
-                    "0x" : "0x3700000000000000000000000000000000000000000000000000000000000000"
-                }
-            }
+        "exec": {
+            "address": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "caller": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "data": "0xaa",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "value": "23"
         },
-        "pre" : {
-           "cd1722f3947def4cf144679da39c4c32bdc35681" : {
-                "balance" : "23",
-                "code" : "{ (MSTORE8 0 55) [[0]](MLOAD 0) (RETURN 0 33)}",
-                "nonce" : "0",
-                "storage" : {
+        "expect": {
+            "cd1722f3947def4cf144679da39c4c32bdc35681": {
+                "storage": {
+                    "0x": "0x3700000000000000000000000000000000000000000000000000000000000000"
                 }
             }
-
         },
-        "exec" : {
-            "address" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "origin" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "caller" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "value" : "23",
-            "data" : "0xaa",
-            "gasPrice" : "100000000000000",
-            "gas" : "100000"
+        "pre": {
+            "cd1722f3947def4cf144679da39c4c32bdc35681": {
+                "balance": "23",
+                "code": "{ (MSTORE8 0 55) [[0]](MLOAD 0) (RETURN 0 33)}",
+                "nonce": "0",
+                "storage": {}
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmSystemOperations/suicide0Filler.json b/src/VMTestsFiller/vmSystemOperations/suicide0Filler.json
index e58545374..54f2a96fc 100644
--- a/src/VMTestsFiller/vmSystemOperations/suicide0Filler.json
+++ b/src/VMTestsFiller/vmSystemOperations/suicide0Filler.json
@@ -1,42 +1,40 @@
 {
     "suicide0": {
-        "env" : {
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-            "currentNumber" : "0",
-            "currentGasLimit" : "10000000",
-            "currentDifficulty" : "256",
-            "currentTimestamp" : "1",
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "cd1722f3947def4cf144679da39c4c32bdc35681" : {
-                "balance" : "100000000000000000000023"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "100000"
+        },
+        "expect": {
+            "cd1722f3947def4cf144679da39c4c32bdc35681": {
+                "balance": "100000000000000000000023"
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ (SELFDESTRUCT (CALLER))}",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ (SELFDESTRUCT (CALLER))}",
+                "nonce": "0",
                 "storage": {}
             },
-            "cd1722f3947def4cf144679da39c4c32bdc35681" : {
-                "balance" : "23",
-                "code" : "0x6000355415600957005b60203560003555",
-                "nonce" : "0",
-                "storage" : {
-                }
+            "cd1722f3947def4cf144679da39c4c32bdc35681": {
+                "balance": "23",
+                "code": "0x6000355415600957005b60203560003555",
+                "nonce": "0",
+                "storage": {}
             }
-
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "100000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmSystemOperations/suicideNotExistingAccountFiller.json b/src/VMTestsFiller/vmSystemOperations/suicideNotExistingAccountFiller.json
index a37df98ab..30ec1aefb 100644
--- a/src/VMTestsFiller/vmSystemOperations/suicideNotExistingAccountFiller.json
+++ b/src/VMTestsFiller/vmSystemOperations/suicideNotExistingAccountFiller.json
@@ -1,42 +1,40 @@
 {
     "suicideNotExistingAccount": {
-        "env" : {
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-            "currentNumber" : "0",
-            "currentGasLimit" : "10000000",
-            "currentDifficulty" : "256",
-            "currentTimestamp" : "1",
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "aa1722f3947def4cf144679da39c4c32bdc35681" : {
-                "balance" : "100000000000000000000000"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "100000"
+        },
+        "expect": {
+            "aa1722f3947def4cf144679da39c4c32bdc35681": {
+                "balance": "100000000000000000000000"
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ (SELFDESTRUCT 0xaa1722f3947def4cf144679da39c4c32bdc35681 )}",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ (SELFDESTRUCT 0xaa1722f3947def4cf144679da39c4c32bdc35681 )}",
+                "nonce": "0",
                 "storage": {}
             },
-            "cd1722f3947def4cf144679da39c4c32bdc35681" : {
-                "balance" : "23",
-                "code" : "0x6000355415600957005b60203560003555",
-                "nonce" : "0",
-                "storage" : {
-                }
+            "cd1722f3947def4cf144679da39c4c32bdc35681": {
+                "balance": "23",
+                "code": "0x6000355415600957005b60203560003555",
+                "nonce": "0",
+                "storage": {}
             }
-
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "100000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmSystemOperations/suicideSendEtherToMeFiller.json b/src/VMTestsFiller/vmSystemOperations/suicideSendEtherToMeFiller.json
index 203cba5ba..cf9f1ddd1 100644
--- a/src/VMTestsFiller/vmSystemOperations/suicideSendEtherToMeFiller.json
+++ b/src/VMTestsFiller/vmSystemOperations/suicideSendEtherToMeFiller.json
@@ -1,42 +1,40 @@
 {
     "suicideSendEtherToMe": {
-        "env" : {
-            "previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-            "currentNumber" : "0",
-            "currentGasLimit" : "10000000",
-            "currentDifficulty" : "256",
-            "currentTimestamp" : "1",
-            "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "10000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
         },
-        "expect" : {
-            "cd1722f3947def4cf144679da39c4c32bdc35681" : {
-                "balance" : "23"
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "1000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "100000"
+        },
+        "expect": {
+            "cd1722f3947def4cf144679da39c4c32bdc35681": {
+                "balance": "23"
             }
         },
-        "pre" : {
-            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-                "balance" : "100000000000000000000000",
-                "nonce" : "0",
-                "code" : "{ (SELFDESTRUCT (ADDRESS) )}",
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "{ (SELFDESTRUCT (ADDRESS) )}",
+                "nonce": "0",
                 "storage": {}
             },
-            "cd1722f3947def4cf144679da39c4c32bdc35681" : {
-                "balance" : "23",
-                "code" : "0x6000355415600957005b60203560003555",
-                "nonce" : "0",
-                "storage" : {
-                }
+            "cd1722f3947def4cf144679da39c4c32bdc35681": {
+                "balance": "23",
+                "code": "0x6000355415600957005b60203560003555",
+                "nonce": "0",
+                "storage": {}
             }
-
-        },
-        "exec" : {
-            "address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-            "origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-            "value" : "100000",
-            "data" : "",
-            "gasPrice" : "100000000000000",
-            "gas" : "1000"
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/VMTestsFiller/vmTests/suicideFiller.json b/src/VMTestsFiller/vmTests/suicideFiller.json
index f75467de2..cbe0da90d 100644
--- a/src/VMTestsFiller/vmTests/suicideFiller.json
+++ b/src/VMTestsFiller/vmTests/suicideFiller.json
@@ -1,29 +1,29 @@
 {
     "suicide": {
-		"env" : {
-		"previousHash" : "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6",
-		"currentNumber" : "0",
-		"currentGasLimit" : "1000000",
-		"currentDifficulty" : "256",
-		"currentTimestamp" : "1",
-        	"currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba"
-		},
-		"pre" : {
-		"0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
-			"balance" : "100000000000000000000000",
-			"nonce" : "0",
-			"code" : "(selfdestruct (caller))",
-			"storage": {}
-		}
-		},
-        "exec" : {
-			"address" : "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
-			"origin" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-			"caller" : "cd1722f3947def4cf144679da39c4c32bdc35681",
-			"value" : "1000000000000000000",
-			"data" : "",
-			"gasPrice" : "100000000000000",
-		    	"gas" : "100000"
-		}
-	}
-}
+        "env": {
+            "currentCoinbase": "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty": "256",
+            "currentGasLimit": "1000000",
+            "currentNumber": "0",
+            "currentTimestamp": "1",
+            "previousHash": "5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "exec": {
+            "address": "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "caller": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "data": "",
+            "gas": "100000",
+            "gasPrice": "100000000000000",
+            "origin": "cd1722f3947def4cf144679da39c4c32bdc35681",
+            "value": "1000000000000000000"
+        },
+        "pre": {
+            "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6": {
+                "balance": "100000000000000000000000",
+                "code": "(selfdestruct (caller))",
+                "nonce": "0",
+                "storage": {}
+            }
+        }
+    }
+}
\ No newline at end of file