stArgsZeroOneBalance tests

46 files changed, 2438 insertions, 0 deletions

diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/addNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/addNonConstFiller.yml
new file mode 100644
index 000000000..51e682998
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/addNonConstFiller.yml
@@ -0,0 +1,53 @@
+---
+addNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x02'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ [[ 0 ]](ADD (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/addmodNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/addmodNonConstFiller.yml
new file mode 100644
index 000000000..e5b7175f8
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/addmodNonConstFiller.yml
@@ -0,0 +1,53 @@
+---
+addmodNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ [[ 0 ]](ADDMOD (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/andNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/andNonConstFiller.yml
new file mode 100644
index 000000000..9b6ea2441
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/andNonConstFiller.yml
@@ -0,0 +1,53 @@
+---
+andNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x01'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ [[ 0 ]](AND (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/balanceNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/balanceNonConstFiller.yml
new file mode 100644
index 000000000..3b481eaab
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/balanceNonConstFiller.yml
@@ -0,0 +1,53 @@
+---
+balanceNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ [[ 0 ]](BALANCE (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/byteNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/byteNonConstFiller.yml
new file mode 100644
index 000000000..77123c614
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/byteNonConstFiller.yml
@@ -0,0 +1,53 @@
+---
+byteNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0'
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ [[ 0 ]](BYTE (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/callNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/callNonConstFiller.yml
new file mode 100644
index 000000000..892ca8911
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/callNonConstFiller.yml
@@ -0,0 +1,54 @@
+---
+callNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int 1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x01'
+  - indexes:
+      data: !!int 1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ [[ 0 ]] (CALL (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    - '0x11223344'
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/callcodeNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/callcodeNonConstFiller.yml
new file mode 100644
index 000000000..e46496607
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/callcodeNonConstFiller.yml
@@ -0,0 +1,54 @@
+---
+callcodeNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int 1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x01'
+  - indexes:
+      data: !!int 1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ [[ 0 ]] (CALLCODE (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    - '0x11223344'
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/calldatacopyNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/calldatacopyNonConstFiller.yml
new file mode 100644
index 000000000..67e0740a8
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/calldatacopyNonConstFiller.yml
@@ -0,0 +1,54 @@
+---
+calldatacopyNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int 1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0'
+  - indexes:
+      data: !!int 1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ (CALLDATACOPY (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    - '0x11223344'
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/calldataloadNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/calldataloadNonConstFiller.yml
new file mode 100644
index 000000000..84d643587
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/calldataloadNonConstFiller.yml
@@ -0,0 +1,54 @@
+---
+calldataloadNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int 1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x1122334400000000000000000000000000000000000000000000000000000000'
+  - indexes:
+      data: !!int 1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x2233440000000000000000000000000000000000000000000000000000000000'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ [[ 0 ]](CALLDATALOAD (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    - '0x11223344'
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/codecopyNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/codecopyNonConstFiller.yml
new file mode 100644
index 000000000..1ff451318
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/codecopyNonConstFiller.yml
@@ -0,0 +1,54 @@
+---
+codecopyNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int 1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0'
+  - indexes:
+      data: !!int 1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ (CODECOPY (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    - '0x11223344'
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/createNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/createNonConstFiller.yml
new file mode 100644
index 000000000..449e47c65
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/createNonConstFiller.yml
@@ -0,0 +1,54 @@
+---
+createNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int 1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0xd2571607e241ecf590ed94b12d87c94babe36db6'
+  - indexes:
+      data: !!int 1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0xd2571607e241ecf590ed94b12d87c94babe36db6'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ [[ 0 ]] (CREATE (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    - '0x11223344'
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/delegatecallNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/delegatecallNonConstFiller.yml
new file mode 100644
index 000000000..4ae23f8c4
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/delegatecallNonConstFiller.yml
@@ -0,0 +1,57 @@
+---
+delegatecallNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int 1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - Homestead
+    - EIP150
+    - EIP158
+    - Byzantium
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x01'
+  - indexes:
+      data: !!int 1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ [[ 0 ]] (DELEGATECALL (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    - '0x11223344'
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/divNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/divNonConstFiller.yml
new file mode 100644
index 000000000..21a5386d2
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/divNonConstFiller.yml
@@ -0,0 +1,53 @@
+---
+divNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x01'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ [[ 0 ]](DIV (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/eqNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/eqNonConstFiller.yml
new file mode 100644
index 000000000..48f97cf89
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/eqNonConstFiller.yml
@@ -0,0 +1,53 @@
+---
+eqNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x01'
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x01'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ [[ 0 ]](EQ (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/expNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/expNonConstFiller.yml
new file mode 100644
index 000000000..97b61f3e5
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/expNonConstFiller.yml
@@ -0,0 +1,53 @@
+---
+expNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x01'
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x01'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ [[ 0 ]](EXP (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/extcodecopyNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/extcodecopyNonConstFiller.yml
new file mode 100644
index 000000000..1f196f16c
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/extcodecopyNonConstFiller.yml
@@ -0,0 +1,54 @@
+---
+extcodecopyNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int 1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0'
+  - indexes:
+      data: !!int 1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ (EXTCODECOPY (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    - '0x11223344'
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/extcodesizeNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/extcodesizeNonConstFiller.yml
new file mode 100644
index 000000000..7c199c6cf
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/extcodesizeNonConstFiller.yml
@@ -0,0 +1,53 @@
+---
+extcodesizeNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ [[ 0 ]](EXTCODESIZE (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/gtNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/gtNonConstFiller.yml
new file mode 100644
index 000000000..565eee16a
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/gtNonConstFiller.yml
@@ -0,0 +1,53 @@
+---
+gtNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ [[ 0 ]](GT (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/iszeroNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/iszeroNonConstFiller.yml
new file mode 100644
index 000000000..bfc808ed3
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/iszeroNonConstFiller.yml
@@ -0,0 +1,53 @@
+---
+iszeroNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x01'
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ [[ 0 ]](ISZERO (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/jumpNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/jumpNonConstFiller.yml
new file mode 100644
index 000000000..8b13de13c
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/jumpNonConstFiller.yml
@@ -0,0 +1,53 @@
+---
+jumpNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x01: '0x00'
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x01: '0x00'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ (JUMP (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/jumpiNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/jumpiNonConstFiller.yml
new file mode 100644
index 000000000..42a7b3850
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/jumpiNonConstFiller.yml
@@ -0,0 +1,53 @@
+---
+jumpiNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x01: '0x00'
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x01: '0x00'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ (JUMPI (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/log0NonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/log0NonConstFiller.yml
new file mode 100644
index 000000000..36de1e5e0
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/log0NonConstFiller.yml
@@ -0,0 +1,53 @@
+---
+log0NonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ (LOG0 (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/log1NonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/log1NonConstFiller.yml
new file mode 100644
index 000000000..8ec9a8cf9
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/log1NonConstFiller.yml
@@ -0,0 +1,53 @@
+---
+log1NonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ (LOG1 (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/log2NonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/log2NonConstFiller.yml
new file mode 100644
index 000000000..54c881753
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/log2NonConstFiller.yml
@@ -0,0 +1,53 @@
+---
+log2NonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ (LOG2 (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/log3NonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/log3NonConstFiller.yml
new file mode 100644
index 000000000..dcbc5cf47
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/log3NonConstFiller.yml
@@ -0,0 +1,53 @@
+---
+log3NonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ (LOG3 (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/ltNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/ltNonConstFiller.yml
new file mode 100644
index 000000000..2e1555ce7
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/ltNonConstFiller.yml
@@ -0,0 +1,53 @@
+---
+ltNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ [[ 0 ]](LT (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/mloadNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/mloadNonConstFiller.yml
new file mode 100644
index 000000000..c2b988fbd
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/mloadNonConstFiller.yml
@@ -0,0 +1,53 @@
+---
+mloadNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ [[ 0 ]](MLOAD (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/modNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/modNonConstFiller.yml
new file mode 100644
index 000000000..d93398ca2
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/modNonConstFiller.yml
@@ -0,0 +1,53 @@
+---
+modNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ [[ 0 ]](MOD (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/mstore8NonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/mstore8NonConstFiller.yml
new file mode 100644
index 000000000..1533add1a
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/mstore8NonConstFiller.yml
@@ -0,0 +1,53 @@
+---
+mstore8NonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ (MSTORE8 (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/mstoreNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/mstoreNonConstFiller.yml
new file mode 100644
index 000000000..a996ecb01
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/mstoreNonConstFiller.yml
@@ -0,0 +1,53 @@
+---
+mstoreNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ (MSTORE (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/mulNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/mulNonConstFiller.yml
new file mode 100644
index 000000000..9b3866f0d
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/mulNonConstFiller.yml
@@ -0,0 +1,53 @@
+---
+mulNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x01'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ [[ 0 ]](MUL (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/mulmodNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/mulmodNonConstFiller.yml
new file mode 100644
index 000000000..691975c69
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/mulmodNonConstFiller.yml
@@ -0,0 +1,53 @@
+---
+mulmodNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ [[ 0 ]](MULMOD (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/notNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/notNonConstFiller.yml
new file mode 100644
index 000000000..a8fd71a2d
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/notNonConstFiller.yml
@@ -0,0 +1,53 @@
+---
+notNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff'
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ [[ 0 ]](NOT (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/orNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/orNonConstFiller.yml
new file mode 100644
index 000000000..0c7727499
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/orNonConstFiller.yml
@@ -0,0 +1,53 @@
+---
+orNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x01'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ [[ 0 ]](OR (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/returnNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/returnNonConstFiller.yml
new file mode 100644
index 000000000..260b96c04
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/returnNonConstFiller.yml
@@ -0,0 +1,53 @@
+---
+returnNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ (RETURN (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/sdivNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/sdivNonConstFiller.yml
new file mode 100644
index 000000000..dece156bd
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/sdivNonConstFiller.yml
@@ -0,0 +1,53 @@
+---
+sdivNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x01'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ [[ 0 ]](SDIV (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/sgtNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/sgtNonConstFiller.yml
new file mode 100644
index 000000000..f2baadcc1
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/sgtNonConstFiller.yml
@@ -0,0 +1,53 @@
+---
+sgtNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ [[ 0 ]](SGT (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/sha3NonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/sha3NonConstFiller.yml
new file mode 100644
index 000000000..346bd43df
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/sha3NonConstFiller.yml
@@ -0,0 +1,53 @@
+---
+sha3NonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470'
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0xbc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ [[ 0 ]](KECCAK256 (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/signextNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/signextNonConstFiller.yml
new file mode 100644
index 000000000..d1b47f1dc
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/signextNonConstFiller.yml
@@ -0,0 +1,53 @@
+---
+signextNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x01'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ [[ 0 ]](SIGNEXTEND (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/sloadNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/sloadNonConstFiller.yml
new file mode 100644
index 000000000..e10b9f376
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/sloadNonConstFiller.yml
@@ -0,0 +1,53 @@
+---
+sloadNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x03: '0x00'
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x03: '0x00'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ [[ 3 ]] (SLOAD (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/sltNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/sltNonConstFiller.yml
new file mode 100644
index 000000000..fc274e864
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/sltNonConstFiller.yml
@@ -0,0 +1,53 @@
+---
+sltNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ [[ 0 ]](SLT (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/smodNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/smodNonConstFiller.yml
new file mode 100644
index 000000000..42dd503f2
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/smodNonConstFiller.yml
@@ -0,0 +1,53 @@
+---
+smodNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ [[ 0 ]](SMOD (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/sstoreNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/sstoreNonConstFiller.yml
new file mode 100644
index 000000000..f4c1a3c04
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/sstoreNonConstFiller.yml
@@ -0,0 +1,53 @@
+---
+sstoreNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x01: '0x00'
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x01: '0x01'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ (SSTORE (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/subNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/subNonConstFiller.yml
new file mode 100644
index 000000000..6c96faeb8
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/subNonConstFiller.yml
@@ -0,0 +1,53 @@
+---
+subNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ [[ 0 ]](SUB (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/suicideNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/suicideNonConstFiller.yml
new file mode 100644
index 000000000..11b49ce63
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/suicideNonConstFiller.yml
@@ -0,0 +1,42 @@
+---
+suicideNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int -1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        shouldnotexist: '1'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ (SELFDESTRUCT (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/xorNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/xorNonConstFiller.yml
new file mode 100644
index 000000000..971cbf339
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/xorNonConstFiller.yml
@@ -0,0 +1,53 @@
+---
+xorNonConst:
+  env:
+    currentCoinbase: 2adc25665018aa1fe0e6bc666dac8fc2697ff9ba
+    currentDifficulty: '0x20000'
+    currentGasLimit: '1000000'
+    currentNumber: '1'
+    currentTimestamp: '1000'
+    previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
+  expect:
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  - indexes:
+      data: !!int -1
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - ALL
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  pre:
+    095e7baea6a6c7c4c2dfeb977efac326af552d87:
+      balance: ''
+      code: '{ [[ 0 ]](XOR (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87) (BALANCE 0x095e7baea6a6c7c4c2dfeb977efac326af552d87)) }'
+      nonce: '0'
+      storage: {}
+    a94f5374fce5edbc8e2a8697c15331677e6ebf0b:
+      balance: '1000000000000000000'
+      code: '0x'
+      nonce: '0'
+      storage: {}
+  transaction:
+    data:
+    - ''
+    gasLimit:
+    - '400000'
+    gasPrice: '1'
+    nonce: '0'
+    secretKey: 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8
+    to: 095e7baea6a6c7c4c2dfeb977efac326af552d87
+    value:
+    - '0'
+    - '1'