src/VMTestsFiller: formatting changes

61 files changed, 1628 insertions, 1645 deletions

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