fix stArgsZeroOneBalance

24 files changed, 332 insertions, 20 deletions

diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/callNonConst_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/callNonConst_d0g0v0Filler.json
index 195200945..078cf1c61 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/callNonConst_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/callNonConst_d0g0v0Filler.json
@@ -26,6 +26,26 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/callNonConst_d0g0v1Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/callNonConst_d0g0v1Filler.json
index e383da629..fbba85e6a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/callNonConst_d0g0v1Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/callNonConst_d0g0v1Filler.json
@@ -26,6 +26,24 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/callcodeNonConst_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/callcodeNonConst_d0g0v0Filler.json
index 0143845a8..ab742a707 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/callcodeNonConst_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/callcodeNonConst_d0g0v0Filler.json
@@ -26,6 +26,26 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/callcodeNonConst_d0g0v1Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/callcodeNonConst_d0g0v1Filler.json
index 8fe519907..a41044e10 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/callcodeNonConst_d0g0v1Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/callcodeNonConst_d0g0v1Filler.json
@@ -26,6 +26,24 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/calldatacopyNonConst_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/calldatacopyNonConst_d0g0v0Filler.json
index 9932e1ac0..f1e99d27a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/calldatacopyNonConst_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/calldatacopyNonConst_d0g0v0Filler.json
@@ -26,6 +26,24 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/calldatacopyNonConst_d0g0v1Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/calldatacopyNonConst_d0g0v1Filler.json
index 9b338a272..ae45cbd19 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/calldatacopyNonConst_d0g0v1Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/calldatacopyNonConst_d0g0v1Filler.json
@@ -26,6 +26,24 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/calldataloadNonConst_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/calldataloadNonConst_d0g0v0Filler.json
index 4ca5859ef..d6b087224 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/calldataloadNonConst_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/calldataloadNonConst_d0g0v0Filler.json
@@ -26,6 +26,24 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/calldataloadNonConst_d0g0v1Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/calldataloadNonConst_d0g0v1Filler.json
index 83a29bc25..643feb0d4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/calldataloadNonConst_d0g0v1Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/calldataloadNonConst_d0g0v1Filler.json
@@ -26,6 +26,24 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/codecopyNonConst_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/codecopyNonConst_d0g0v0Filler.json
index c4be38201..0c0a08c19 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/codecopyNonConst_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/codecopyNonConst_d0g0v0Filler.json
@@ -26,6 +26,24 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/codecopyNonConst_d0g0v1Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/codecopyNonConst_d0g0v1Filler.json
index 7a81cb225..f48c47959 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/codecopyNonConst_d0g0v1Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/codecopyNonConst_d0g0v1Filler.json
@@ -26,6 +26,24 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/createNonConst_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/createNonConst_d0g0v0Filler.json
index ecdd67475..429ca5a32 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/createNonConst_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/createNonConst_d0g0v0Filler.json
@@ -26,6 +26,26 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/createNonConst_d0g0v1Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/createNonConst_d0g0v1Filler.json
index ad21e1d28..6e168e0a6 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/createNonConst_d0g0v1Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/createNonConst_d0g0v1Filler.json
@@ -26,6 +26,26 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/delegatecallNonConst_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/delegatecallNonConst_d0g0v0Filler.json
index 2e5227f53..f2533b7c0 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/delegatecallNonConst_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/delegatecallNonConst_d0g0v0Filler.json
@@ -26,6 +26,26 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/delegatecallNonConst_d0g0v1Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/delegatecallNonConst_d0g0v1Filler.json
index bcb0a1617..94df594bb 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/delegatecallNonConst_d0g0v1Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/delegatecallNonConst_d0g0v1Filler.json
@@ -26,6 +26,24 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/extcodecopyNonConst_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/extcodecopyNonConst_d0g0v0Filler.json
index a8987a6f4..26c3bf775 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/extcodecopyNonConst_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/extcodecopyNonConst_d0g0v0Filler.json
@@ -26,6 +26,24 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/extcodecopyNonConst_d0g0v1Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/extcodecopyNonConst_d0g0v1Filler.json
index d70ed76a9..fddda4e90 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/extcodecopyNonConst_d0g0v1Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stArgsZeroOneBalance/extcodecopyNonConst_d0g0v1Filler.json
@@ -26,6 +26,24 @@
             }
         ],
         "expect" : [
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
         ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/callNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/callNonConstFiller.yml
index 99026fb1e..a940783bc 100644
--- a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/callNonConstFiller.yml
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/callNonConstFiller.yml
@@ -9,7 +9,7 @@ callNonConst:
     previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
   expect:
   - indexes:
-      data: !!int 1
+      data: !!int -1
       gas: !!int -1
       value: !!int 0
     network:
@@ -19,7 +19,7 @@ callNonConst:
         storage:
           0x: '0x01'
   - indexes:
-      data: !!int 1
+      data: !!int -1
       gas: !!int -1
       value: !!int 1
     network:
@@ -42,7 +42,6 @@ callNonConst:
   transaction:
     data:
     - ''
-    - '0x11223344'
     gasLimit:
     - '400000'
     gasPrice: '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/callcodeNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/callcodeNonConstFiller.yml
index 3af06e2a8..cca1c6f51 100644
--- a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/callcodeNonConstFiller.yml
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/callcodeNonConstFiller.yml
@@ -9,7 +9,7 @@ callcodeNonConst:
     previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
   expect:
   - indexes:
-      data: !!int 1
+      data: !!int -1
       gas: !!int -1
       value: !!int 0
     network:
@@ -19,7 +19,7 @@ callcodeNonConst:
         storage:
           0x: '0x01'
   - indexes:
-      data: !!int 1
+      data: !!int -1
       gas: !!int -1
       value: !!int 1
     network:
@@ -42,7 +42,6 @@ callcodeNonConst:
   transaction:
     data:
     - ''
-    - '0x11223344'
     gasLimit:
     - '400000'
     gasPrice: '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/calldatacopyNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/calldatacopyNonConstFiller.yml
index 506155523..37bf77ab0 100644
--- a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/calldatacopyNonConstFiller.yml
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/calldatacopyNonConstFiller.yml
@@ -9,7 +9,7 @@ calldatacopyNonConst:
     previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
   expect:
   - indexes:
-      data: !!int 1
+      data: !!int -1
       gas: !!int -1
       value: !!int 0
     network:
@@ -19,7 +19,7 @@ calldatacopyNonConst:
         storage:
           0x: '0'
   - indexes:
-      data: !!int 1
+      data: !!int -1
       gas: !!int -1
       value: !!int 1
     network:
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/calldataloadNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/calldataloadNonConstFiller.yml
index 4f5cefc5b..93fa1c5e7 100644
--- a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/calldataloadNonConstFiller.yml
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/calldataloadNonConstFiller.yml
@@ -19,6 +19,16 @@ calldataloadNonConst:
         storage:
           0x: '0x1122334400000000000000000000000000000000000000000000000000000000'
   - indexes:
+      data: !!int 0
+      gas: !!int -1
+      value: !!int 0
+    network:
+    - '>=Byzantium'
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
+  - indexes:
       data: !!int 1
       gas: !!int -1
       value: !!int 1
@@ -28,6 +38,16 @@ calldataloadNonConst:
       095e7baea6a6c7c4c2dfeb977efac326af552d87:
         storage:
           0x: '0x2233440000000000000000000000000000000000000000000000000000000000'
+  - indexes:
+      data: !!int 0
+      gas: !!int -1
+      value: !!int 1
+    network:
+    - '>=Byzantium'
+    result:
+      095e7baea6a6c7c4c2dfeb977efac326af552d87:
+        storage:
+          0x: '0x00'
   pre:
     095e7baea6a6c7c4c2dfeb977efac326af552d87:
       balance: ''
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/codecopyNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/codecopyNonConstFiller.yml
index e49031344..28505c4c1 100644
--- a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/codecopyNonConstFiller.yml
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/codecopyNonConstFiller.yml
@@ -9,7 +9,7 @@ codecopyNonConst:
     previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
   expect:
   - indexes:
-      data: !!int 1
+      data: !!int -1
       gas: !!int -1
       value: !!int 0
     network:
@@ -19,7 +19,7 @@ codecopyNonConst:
         storage:
           0x: '0'
   - indexes:
-      data: !!int 1
+      data: !!int -1
       gas: !!int -1
       value: !!int 1
     network:
@@ -42,7 +42,6 @@ codecopyNonConst:
   transaction:
     data:
     - ''
-    - '0x11223344'
     gasLimit:
     - '400000'
     gasPrice: '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/createNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/createNonConstFiller.yml
index 6213895e1..977f93adb 100644
--- a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/createNonConstFiller.yml
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/createNonConstFiller.yml
@@ -9,7 +9,7 @@ createNonConst:
     previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
   expect:
   - indexes:
-      data: !!int 1
+      data: !!int -1
       gas: !!int -1
       value: !!int 0
     network:
@@ -19,7 +19,7 @@ createNonConst:
         storage:
           0x: '0xd2571607e241ecf590ed94b12d87c94babe36db6'
   - indexes:
-      data: !!int 1
+      data: !!int -1
       gas: !!int -1
       value: !!int 1
     network:
@@ -42,7 +42,6 @@ createNonConst:
   transaction:
     data:
     - ''
-    - '0x11223344'
     gasLimit:
     - '400000'
     gasPrice: '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/delegatecallNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/delegatecallNonConstFiller.yml
index 58f602697..19bf7ece2 100644
--- a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/delegatecallNonConstFiller.yml
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/delegatecallNonConstFiller.yml
@@ -9,7 +9,7 @@ delegatecallNonConst:
     previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
   expect:
   - indexes:
-      data: !!int 1
+      data: !!int -1
       gas: !!int -1
       value: !!int 0
     network:
@@ -19,7 +19,7 @@ delegatecallNonConst:
         storage:
           0x: '0x01'
   - indexes:
-      data: !!int 1
+      data: !!int -1
       gas: !!int -1
       value: !!int 1
     network:
@@ -42,7 +42,6 @@ delegatecallNonConst:
   transaction:
     data:
     - ''
-    - '0x11223344'
     gasLimit:
     - '400000'
     gasPrice: '1'
diff --git a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/extcodecopyNonConstFiller.yml b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/extcodecopyNonConstFiller.yml
index 976b6870f..aaf377289 100644
--- a/src/GeneralStateTestsFiller/stArgsZeroOneBalance/extcodecopyNonConstFiller.yml
+++ b/src/GeneralStateTestsFiller/stArgsZeroOneBalance/extcodecopyNonConstFiller.yml
@@ -9,7 +9,7 @@ extcodecopyNonConst:
     previousHash: 5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6
   expect:
   - indexes:
-      data: !!int 1
+      data: !!int -1
       gas: !!int -1
       value: !!int 0
     network:
@@ -19,7 +19,7 @@ extcodecopyNonConst:
         storage:
           0x: '0'
   - indexes:
-      data: !!int 1
+      data: !!int -1
       gas: !!int -1
       value: !!int 1
     network:
@@ -42,7 +42,6 @@ extcodecopyNonConst:
   transaction:
     data:
     - ''
-    - '0x11223344'
     gasLimit:
     - '400000'
     gasPrice: '1'