From 389bf562d8be10c05de4edd0e4578050640bef67 Mon Sep 17 00:00:00 2001
From: Dimitry <dimitry@ethereum.org>
Date: Wed, 31 Jan 2018 18:08:00 +0300
Subject: refill blockchain stCallDelegateCodesHomestead

---
 .../callcallcallcode_001_OOGE_d0g0v0Filler.json    |  85 ++++++++++++-
 ...allcallcallcode_001_OOGMAfter_d0g0v0Filler.json | 133 ++++++++++++++++++++-
 ...llcallcallcode_001_OOGMBefore_d0g0v0Filler.json |  82 ++++++++++++-
 ...llcallcallcode_001_SuicideEnd_d0g0v0Filler.json |  79 +++++++++++-
 ...allcallcode_001_SuicideMiddle_d0g0v0Filler.json |  82 ++++++++++++-
 .../callcallcallcode_001_d0g0v0Filler.json         | 100 +++++++++++++++-
 ...llcallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json |  92 +++++++++++++-
 .../callcallcode_01_OOGE_d0g0v0Filler.json         |  58 ++++++++-
 .../callcallcode_01_SuicideEnd_d0g0v0Filler.json   |  64 +++++++++-
 .../callcallcode_01_d0g0v0Filler.json              |  85 ++++++++++++-
 .../callcallcodecall_010_OOGE_d0g0v0Filler.json    |  85 ++++++++++++-
 ...allcallcodecall_010_OOGMAfter_d0g0v0Filler.json | 132 +++++++++++++++++++-
 ...llcallcodecall_010_OOGMBefore_d0g0v0Filler.json |  82 ++++++++++++-
 ...llcallcodecall_010_SuicideEnd_d0g0v0Filler.json |  67 ++++++++++-
 ...allcodecall_010_SuicideMiddle_d0g0v0Filler.json |  70 ++++++++++-
 .../callcallcodecall_010_d0g0v0Filler.json         | 103 +++++++++++++++-
 ...llcallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json |  92 +++++++++++++-
 ...callcallcodecallcode_011_OOGE_d0g0v0Filler.json |  85 ++++++++++++-
 ...allcodecallcode_011_OOGMAfter_d0g0v0Filler.json | 107 ++++++++++++++++-
 ...llcodecallcode_011_OOGMBefore_d0g0v0Filler.json |  82 ++++++++++++-
 ...llcodecallcode_011_SuicideEnd_d0g0v0Filler.json |  76 +++++++++++-
 ...odecallcode_011_SuicideMiddle_d0g0v0Filler.json |  49 +++++++-
 .../callcallcodecallcode_011_d0g0v0Filler.json     |  76 +++++++++++-
 ...llcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json |  92 +++++++++++++-
 .../callcodecall_10_OOGE_d0g0v0Filler.json         |  70 ++++++++++-
 .../callcodecall_10_SuicideEnd_d0g0v0Filler.json   |  52 +++++++-
 .../callcodecall_10_d0g0v0Filler.json              |  73 ++++++++++-
 .../callcodecallcall_100_OOGE_d0g0v0Filler.json    |  85 ++++++++++++-
 ...allcodecallcall_100_OOGMAfter_d0g0v0Filler.json | 107 ++++++++++++++++-
 ...llcodecallcall_100_OOGMBefore_d0g0v0Filler.json |  82 ++++++++++++-
 ...llcodecallcall_100_SuicideEnd_d0g0v0Filler.json |  82 ++++++++++++-
 ...odecallcall_100_SuicideMiddle_d0g0v0Filler.json |  73 ++++++++++-
 .../callcodecallcall_100_d0g0v0Filler.json         |  91 +++++++++++++-
 ...llcodecallcall_ABCB_RECURSIVE_d0g0v0Filler.json | 108 ++++++++++++++++-
 ...callcodecallcallcode_101_OOGE_d0g0v0Filler.json |  85 ++++++++++++-
 ...odecallcallcode_101_OOGMAfter_d0g0v0Filler.json | 107 ++++++++++++++++-
 ...decallcallcode_101_OOGMBefore_d0g0v0Filler.json |  82 ++++++++++++-
 ...decallcallcode_101_SuicideEnd_d0g0v0Filler.json |  79 +++++++++++-
 ...allcallcode_101_SuicideMiddle_d0g0v0Filler.json |  73 ++++++++++-
 .../callcodecallcallcode_101_d0g0v0Filler.json     | 106 +++++++++++++++-
 ...decallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json | 108 ++++++++++++++++-
 .../callcodecallcode_11_OOGE_d0g0v0Filler.json     |  70 ++++++++++-
 ...allcodecallcode_11_SuicideEnd_d0g0v0Filler.json |  49 +++++++-
 .../callcodecallcode_11_d0g0v0Filler.json          |  97 ++++++++++++++-
 ...callcodecallcodecall_110_OOGE_d0g0v0Filler.json |  85 ++++++++++++-
 ...odecallcodecall_110_OOGMAfter_d0g0v0Filler.json | 107 ++++++++++++++++-
 ...decallcodecall_110_OOGMBefore_d0g0v0Filler.json |  82 ++++++++++++-
 ...decallcodecall_110_SuicideEnd_d0g0v0Filler.json |  64 +++++++++-
 ...allcodecall_110_SuicideMiddle_d0g0v0Filler.json |  67 ++++++++++-
 .../callcodecallcodecall_110_d0g0v0Filler.json     |  94 ++++++++++++++-
 ...decallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json | 108 ++++++++++++++++-
 ...codecallcodecallcode_111_OOGE_d0g0v0Filler.json |  85 ++++++++++++-
 ...allcodecallcode_111_OOGMAfter_d0g0v0Filler.json | 107 ++++++++++++++++-
 ...llcodecallcode_111_OOGMBefore_d0g0v0Filler.json |  82 ++++++++++++-
 ...llcodecallcode_111_SuicideEnd_d0g0v0Filler.json |  55 ++++++++-
 ...odecallcode_111_SuicideMiddle_d0g0v0Filler.json |  64 +++++++++-
 .../callcodecallcodecallcode_111_d0g0v0Filler.json |  73 ++++++++++-
 ...llcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json | 108 ++++++++++++++++-
 58 files changed, 4860 insertions(+), 58 deletions(-)

(limited to 'src')

diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGE_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGE_d0g0v0Filler.json
index 588909d3f..67d9a3730 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGE_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGE_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,89 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMAfter_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMAfter_d0g0v0Filler.json
index 914b1f370..da3980e20 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMAfter_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMAfter_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,137 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMBefore_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMBefore_d0g0v0Filler.json
index 5c424a266..880f7ba09 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMBefore_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_OOGMBefore_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,86 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideEnd_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideEnd_d0g0v0Filler.json
index 9465d7d00..ed7ecdb5e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideEnd_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideEnd_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,83 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideMiddle_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideMiddle_d0g0v0Filler.json
index ece48b491..7a931307e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideMiddle_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_SuicideMiddle_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,86 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "balance" : "0x0de0b6b5fb6fe400",
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "balance" : "0x02540be400",
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "balance" : "0x02540be400",
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "balance" : "0x0de0b6b5fb6fe400",
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "balance" : "0x02540be400",
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "balance" : "0x02540be400",
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "balance" : "0x0de0b6b5fb6fe400",
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "balance" : "0x02540be400",
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "balance" : "0x02540be400",
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_d0g0v0Filler.json
index fa2c454c6..6c55fa36c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_001_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,104 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                            "0x014a" : "0x1000000000000000000000000000000000000002",
+                            "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x0150" : "0x40",
+                            "0x0152" : "0x26",
+                            "0x0154" : "0x01",
+                            "0x02" : "0x01",
+                            "0x03" : "0x01",
+                            "0x04" : "0x1000000000000000000000000000000000000001",
+                            "0x07" : "0x02"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                            "0x014a" : "0x1000000000000000000000000000000000000002",
+                            "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x0150" : "0x40",
+                            "0x0152" : "0x26",
+                            "0x0154" : "0x01",
+                            "0x02" : "0x01",
+                            "0x03" : "0x01",
+                            "0x04" : "0x1000000000000000000000000000000000000001",
+                            "0x07" : "0x02"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                            "0x014a" : "0x1000000000000000000000000000000000000002",
+                            "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x0150" : "0x40",
+                            "0x0152" : "0x26",
+                            "0x0154" : "0x01",
+                            "0x02" : "0x01",
+                            "0x03" : "0x01",
+                            "0x04" : "0x1000000000000000000000000000000000000001",
+                            "0x07" : "0x02"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json
index aa878bd18..3565c5812 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,96 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0x4563918244fca3bf"
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0x4563918244fcab7b"
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0x29a2241af634ab7b"
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0x29a2241af634ab7b"
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01_OOGE_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01_OOGE_d0g0v0Filler.json
index 6d94d8784..ef0e5a2e6 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01_OOGE_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01_OOGE_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,62 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01_SuicideEnd_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01_SuicideEnd_d0g0v0Filler.json
index 9f22883c6..d614d395c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01_SuicideEnd_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01_SuicideEnd_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,68 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01_d0g0v0Filler.json
index 5c8dd7855..aded6f460 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcode_01_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,89 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x01",
+                            "0x04" : "0x1000000000000000000000000000000000000000",
+                            "0x07" : "0x01",
+                            "0xe6" : "0x1000000000000000000000000000000000000001",
+                            "0xe8" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0xec" : "0x40",
+                            "0xee" : "0x21",
+                            "0xf0" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x01",
+                            "0x04" : "0x1000000000000000000000000000000000000000",
+                            "0x07" : "0x01",
+                            "0xe6" : "0x1000000000000000000000000000000000000001",
+                            "0xe8" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0xec" : "0x40",
+                            "0xee" : "0x21",
+                            "0xf0" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x01",
+                            "0x04" : "0x1000000000000000000000000000000000000000",
+                            "0x07" : "0x01",
+                            "0xe6" : "0x1000000000000000000000000000000000000001",
+                            "0xe8" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0xec" : "0x40",
+                            "0xee" : "0x21",
+                            "0xf0" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGE_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGE_d0g0v0Filler.json
index fd282dca2..28042808a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGE_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGE_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,89 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMAfter_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMAfter_d0g0v0Filler.json
index 02cd452f3..74fcae067 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMAfter_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMAfter_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,136 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMBefore_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMBefore_d0g0v0Filler.json
index cb7a7e193..e722a2046 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMBefore_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_OOGMBefore_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,86 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideEnd_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideEnd_d0g0v0Filler.json
index 7b82fe30c..207afaafc 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideEnd_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideEnd_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,71 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                            "0x03" : "0x01"
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                            "0x03" : "0x01"
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                            "0x03" : "0x01"
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideMiddle_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideMiddle_d0g0v0Filler.json
index f7c65d90c..3cd5f6121 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideMiddle_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_SuicideMiddle_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,74 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "balance" : "0x0de0b6b5fb6fe400",
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "balance" : "0x02540be400",
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "balance" : "0x0de0b6b5fb6fe400",
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "balance" : "0x02540be400",
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "balance" : "0x0de0b6b5fb6fe400",
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "balance" : "0x02540be400",
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_d0g0v0Filler.json
index 05be563ba..b147d827a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_010_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,107 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x01",
+                            "0x05" : "0x1000000000000000000000000000000000000000"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                            "0x014a" : "0x1000000000000000000000000000000000000003",
+                            "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x0150" : "0x40",
+                            "0x0152" : "0x26",
+                            "0x0154" : "0x01",
+                            "0x03" : "0x01",
+                            "0x04" : "0x1000000000000000000000000000000000000001",
+                            "0x07" : "0x02"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x01",
+                            "0x05" : "0x1000000000000000000000000000000000000000"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                            "0x014a" : "0x1000000000000000000000000000000000000003",
+                            "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x0150" : "0x40",
+                            "0x0152" : "0x26",
+                            "0x0154" : "0x01",
+                            "0x03" : "0x01",
+                            "0x04" : "0x1000000000000000000000000000000000000001",
+                            "0x07" : "0x02"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x02" : "0x01",
+                            "0x05" : "0x1000000000000000000000000000000000000000"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                            "0x014a" : "0x1000000000000000000000000000000000000003",
+                            "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x0150" : "0x40",
+                            "0x0152" : "0x26",
+                            "0x0154" : "0x01",
+                            "0x03" : "0x01",
+                            "0x04" : "0x1000000000000000000000000000000000000001",
+                            "0x07" : "0x02"
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json
index bd13dc7b9..69a75a816 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,96 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0x4563918244fca3bf"
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0x4563918244fcab7b"
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0x29a2241af634ab7b"
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0x29a2241af634ab7b"
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGE_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGE_d0g0v0Filler.json
index 104caac0f..67ab18ac1 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGE_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGE_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,89 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMAfter_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMAfter_d0g0v0Filler.json
index 64f73038f..2935c76b3 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMAfter_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMAfter_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,111 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMBefore_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMBefore_d0g0v0Filler.json
index 37f74b2cb..c8d178beb 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMBefore_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_OOGMBefore_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,86 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideEnd_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideEnd_d0g0v0Filler.json
index 182d05358..b3f65493f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideEnd_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideEnd_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,80 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideMiddle_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideMiddle_d0g0v0Filler.json
index c47b24cb9..940c50b57 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideMiddle_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_SuicideMiddle_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,53 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000002" : {
+                        "balance" : "0x02540be400",
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "balance" : "0x02540be400",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000002" : {
+                        "balance" : "0x02540be400",
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "balance" : "0x02540be400",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000002" : {
+                        "balance" : "0x02540be400",
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "balance" : "0x02540be400",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_d0g0v0Filler.json
index 0c44a6173..de8c22138 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_011_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,80 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x014a" : "0x1000000000000000000000000000000000000001",
+                            "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x0150" : "0x40",
+                            "0x0152" : "0x26",
+                            "0x0154" : "0x01",
+                            "0x02" : "0x01",
+                            "0x03" : "0x01",
+                            "0x04" : "0x1000000000000000000000000000000000000000",
+                            "0x07" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x014a" : "0x1000000000000000000000000000000000000001",
+                            "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x0150" : "0x40",
+                            "0x0152" : "0x26",
+                            "0x0154" : "0x01",
+                            "0x02" : "0x01",
+                            "0x03" : "0x01",
+                            "0x04" : "0x1000000000000000000000000000000000000000",
+                            "0x07" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01",
+                            "0x014a" : "0x1000000000000000000000000000000000000001",
+                            "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x0150" : "0x40",
+                            "0x0152" : "0x26",
+                            "0x0154" : "0x01",
+                            "0x02" : "0x01",
+                            "0x03" : "0x01",
+                            "0x04" : "0x1000000000000000000000000000000000000000",
+                            "0x07" : "0x01"
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json
index 5428bc204..82b2b8285 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcallcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,96 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0x4563918244fca3bc"
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0x4563918244fcab78"
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0x29a2241af634ab78"
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0x29a2241af634ab78"
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10_OOGE_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10_OOGE_d0g0v0Filler.json
index 83ab2cf1b..7652fbb24 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10_OOGE_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10_OOGE_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,74 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10_SuicideEnd_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10_SuicideEnd_d0g0v0Filler.json
index 13f08a77a..e139bd192 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10_SuicideEnd_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10_SuicideEnd_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,56 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                            "0x02" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                            "0x02" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                            "0x02" : "0x01"
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10_d0g0v0Filler.json
index 42c755dac..e04c019df 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecall_10_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,77 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                            "0x02" : "0x01",
+                            "0x04" : "0x1000000000000000000000000000000000000000",
+                            "0x07" : "0x01",
+                            "0xe6" : "0x1000000000000000000000000000000000000002",
+                            "0xe8" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0xec" : "0x40",
+                            "0xee" : "0x21",
+                            "0xf0" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                            "0x02" : "0x01",
+                            "0x04" : "0x1000000000000000000000000000000000000000",
+                            "0x07" : "0x01",
+                            "0xe6" : "0x1000000000000000000000000000000000000002",
+                            "0xe8" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0xec" : "0x40",
+                            "0xee" : "0x21",
+                            "0xf0" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                            "0x02" : "0x01",
+                            "0x04" : "0x1000000000000000000000000000000000000000",
+                            "0x07" : "0x01",
+                            "0xe6" : "0x1000000000000000000000000000000000000002",
+                            "0xe8" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0xec" : "0x40",
+                            "0xee" : "0x21",
+                            "0xf0" : "0x01"
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGE_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGE_d0g0v0Filler.json
index 0d4729acb..97561f15d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGE_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGE_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,89 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMAfter_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMAfter_d0g0v0Filler.json
index 70b20c73a..e6ee6d704 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMAfter_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMAfter_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,111 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMBefore_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMBefore_d0g0v0Filler.json
index 108df21b3..631537968 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMBefore_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_OOGMBefore_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,86 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideEnd_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideEnd_d0g0v0Filler.json
index 41fbcdd33..b992495c3 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideEnd_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideEnd_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,86 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                            "0x03" : "0x01"
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                            "0x03" : "0x01"
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                            "0x03" : "0x01"
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideMiddle_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideMiddle_d0g0v0Filler.json
index 5557f1647..dba2c9338 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideMiddle_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_SuicideMiddle_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,77 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "balance" : "0x0de0b6b5fb6fe400",
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "balance" : "0x02540be400",
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "balance" : "0x0de0b6b5fb6fe400",
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "balance" : "0x02540be400",
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "balance" : "0x0de0b6b5fb6fe400",
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "balance" : "0x02540be400",
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_d0g0v0Filler.json
index 57b522a6e..e2e91f578 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_100_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,95 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01",
+                            "0x05" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                            "0x02" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                            "0x014a" : "0x1000000000000000000000000000000000000003",
+                            "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x0150" : "0x40",
+                            "0x0152" : "0x26",
+                            "0x0154" : "0x01",
+                            "0x03" : "0x01",
+                            "0x04" : "0x1000000000000000000000000000000000000002",
+                            "0x07" : "0x02"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01",
+                            "0x05" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                            "0x02" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                            "0x014a" : "0x1000000000000000000000000000000000000003",
+                            "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x0150" : "0x40",
+                            "0x0152" : "0x26",
+                            "0x0154" : "0x01",
+                            "0x03" : "0x01",
+                            "0x04" : "0x1000000000000000000000000000000000000002",
+                            "0x07" : "0x02"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01",
+                            "0x05" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                            "0x02" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                            "0x014a" : "0x1000000000000000000000000000000000000003",
+                            "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x0150" : "0x40",
+                            "0x0152" : "0x26",
+                            "0x0154" : "0x01",
+                            "0x03" : "0x01",
+                            "0x04" : "0x1000000000000000000000000000000000000002",
+                            "0x07" : "0x02"
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_ABCB_RECURSIVE_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_ABCB_RECURSIVE_d0g0v0Filler.json
index 62915dc42..3406aa229 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_ABCB_RECURSIVE_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcall_ABCB_RECURSIVE_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,112 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0x4563918244fca3bf"
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0x4563918244fcab7b"
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0x29a2241af634ab7b"
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0x29a2241af634ab7b"
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGE_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGE_d0g0v0Filler.json
index 2a9cf7b62..27d5b5537 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGE_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGE_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,89 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMAfter_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMAfter_d0g0v0Filler.json
index 01ae6e953..92baccd30 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMAfter_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMAfter_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,111 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMBefore_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMBefore_d0g0v0Filler.json
index 733829146..6e5192219 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMBefore_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_OOGMBefore_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,86 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideEnd_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideEnd_d0g0v0Filler.json
index 6acbc2c09..d4a2fb14b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideEnd_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideEnd_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,83 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideMiddle_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideMiddle_d0g0v0Filler.json
index ab989ab2c..02bdc3d86 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideMiddle_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_SuicideMiddle_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,77 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "balance" : "0x0de0b6b5fb6fe400",
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "balance" : "0x02540be400",
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "balance" : "0x0de0b6b5fb6fe400",
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "balance" : "0x02540be400",
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "balance" : "0x0de0b6b5fb6fe400",
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "balance" : "0x02540be400",
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_d0g0v0Filler.json
index 515159246..fb5c8d5d7 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_101_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,110 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01",
+                            "0x05" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                            "0x014a" : "0x1000000000000000000000000000000000000002",
+                            "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x0150" : "0x40",
+                            "0x0152" : "0x26",
+                            "0x0154" : "0x01",
+                            "0x02" : "0x01",
+                            "0x03" : "0x01",
+                            "0x04" : "0x1000000000000000000000000000000000000000",
+                            "0x06" : "0x1000000000000000000000000000000000000000",
+                            "0x07" : "0x01"
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01",
+                            "0x05" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                            "0x014a" : "0x1000000000000000000000000000000000000002",
+                            "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x0150" : "0x40",
+                            "0x0152" : "0x26",
+                            "0x0154" : "0x01",
+                            "0x02" : "0x01",
+                            "0x03" : "0x01",
+                            "0x04" : "0x1000000000000000000000000000000000000000",
+                            "0x06" : "0x1000000000000000000000000000000000000000",
+                            "0x07" : "0x01"
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01",
+                            "0x05" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                            "0x014a" : "0x1000000000000000000000000000000000000002",
+                            "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x0150" : "0x40",
+                            "0x0152" : "0x26",
+                            "0x0154" : "0x01",
+                            "0x02" : "0x01",
+                            "0x03" : "0x01",
+                            "0x04" : "0x1000000000000000000000000000000000000000",
+                            "0x06" : "0x1000000000000000000000000000000000000000",
+                            "0x07" : "0x01"
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json
index a332949da..c3e33da09 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,112 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0x4563918244fca3bc"
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0x4563918244fcab78"
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0x29a2241af634ab78"
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0x29a2241af634ab78"
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11_OOGE_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11_OOGE_d0g0v0Filler.json
index 04ec61f18..83e6c1b06 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11_OOGE_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11_OOGE_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,74 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11_SuicideEnd_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11_SuicideEnd_d0g0v0Filler.json
index d4ec6fd73..c20db9b48 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11_SuicideEnd_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11_SuicideEnd_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,53 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11_d0g0v0Filler.json
index 81423ddf6..a9c2ebd65 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcode_11_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,101 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01",
+                            "0x02" : "0x01",
+                            "0x04" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0xe6" : "0x1000000000000000000000000000000000000000",
+                            "0xe8" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0xec" : "0x40",
+                            "0xee" : "0x21",
+                            "0xf0" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01",
+                            "0x02" : "0x01",
+                            "0x04" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0xe6" : "0x1000000000000000000000000000000000000000",
+                            "0xe8" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0xec" : "0x40",
+                            "0xee" : "0x21",
+                            "0xf0" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01",
+                            "0x02" : "0x01",
+                            "0x04" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0xe6" : "0x1000000000000000000000000000000000000000",
+                            "0xe8" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0xec" : "0x40",
+                            "0xee" : "0x21",
+                            "0xf0" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "nonce" : "0x01",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGE_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGE_d0g0v0Filler.json
index be60efc0c..da5f011cd 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGE_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGE_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,89 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMAfter_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMAfter_d0g0v0Filler.json
index a3dbc7434..ca6ae45d5 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMAfter_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMAfter_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,111 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMBefore_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMBefore_d0g0v0Filler.json
index bbaa6b979..6467ee32a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMBefore_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_OOGMBefore_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,86 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideEnd_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideEnd_d0g0v0Filler.json
index cef4f1f33..b5d0f3134 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideEnd_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideEnd_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,68 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                            "0x03" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                            "0x03" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                            "0x03" : "0x01"
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideMiddle_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideMiddle_d0g0v0Filler.json
index ce2da74f2..f539d2d29 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideMiddle_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_SuicideMiddle_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,71 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "balance" : "0x02540be400",
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "balance" : "0x02540be400",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "balance" : "0x02540be400",
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "balance" : "0x02540be400",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "balance" : "0x02540be400",
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "balance" : "0x02540be400",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_d0g0v0Filler.json
index 5802c1c9d..f1560aef3 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_110_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,98 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01",
+                            "0x02" : "0x01",
+                            "0x05" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x06" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                            "0x014a" : "0x1000000000000000000000000000000000000003",
+                            "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x0150" : "0x40",
+                            "0x0152" : "0x26",
+                            "0x0154" : "0x01",
+                            "0x03" : "0x01",
+                            "0x04" : "0x1000000000000000000000000000000000000000",
+                            "0x07" : "0x01"
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01",
+                            "0x02" : "0x01",
+                            "0x05" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x06" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                            "0x014a" : "0x1000000000000000000000000000000000000003",
+                            "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x0150" : "0x40",
+                            "0x0152" : "0x26",
+                            "0x0154" : "0x01",
+                            "0x03" : "0x01",
+                            "0x04" : "0x1000000000000000000000000000000000000000",
+                            "0x07" : "0x01"
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01",
+                            "0x02" : "0x01",
+                            "0x05" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x06" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                            "0x014a" : "0x1000000000000000000000000000000000000003",
+                            "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x0150" : "0x40",
+                            "0x0152" : "0x26",
+                            "0x0154" : "0x01",
+                            "0x03" : "0x01",
+                            "0x04" : "0x1000000000000000000000000000000000000000",
+                            "0x07" : "0x01"
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json
index 88ac3a75a..c72245360 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,112 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0x4563918244fca3bc"
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0x4563918244fcab78"
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0x29a2241af634ab78"
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0x29a2241af634ab78"
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGE_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGE_d0g0v0Filler.json
index beaab4ffd..13f7af9e2 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGE_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGE_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,89 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMAfter_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMAfter_d0g0v0Filler.json
index cb63eeaa8..9db3a76b0 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMAfter_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMAfter_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,111 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMBefore_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMBefore_d0g0v0Filler.json
index 5238b9dfc..e8538c803 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMBefore_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_OOGMBefore_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,86 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideEnd_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideEnd_d0g0v0Filler.json
index 7de856374..a03a9e2e2 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideEnd_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideEnd_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,59 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddle_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddle_d0g0v0Filler.json
index 68dcda530..6f36f1976 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddle_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_SuicideMiddle_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,68 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000001" : {
+                        "balance" : "0x02540be400",
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "balance" : "0x02540be400",
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "balance" : "0x02540be400",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000001" : {
+                        "balance" : "0x02540be400",
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "balance" : "0x02540be400",
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "balance" : "0x02540be400",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000001" : {
+                        "balance" : "0x02540be400",
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "balance" : "0x02540be400",
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "balance" : "0x02540be400",
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_d0g0v0Filler.json
index 5a4a2533e..e3d2db7a8 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_111_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,77 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01",
+                            "0x014a" : "0x1000000000000000000000000000000000000000",
+                            "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x0150" : "0x40",
+                            "0x0152" : "0x26",
+                            "0x0154" : "0x01",
+                            "0x02" : "0x01",
+                            "0x03" : "0x01",
+                            "0x04" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01",
+                            "0x014a" : "0x1000000000000000000000000000000000000000",
+                            "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x0150" : "0x40",
+                            "0x0152" : "0x26",
+                            "0x0154" : "0x01",
+                            "0x02" : "0x01",
+                            "0x03" : "0x01",
+                            "0x04" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01",
+                            "0x014a" : "0x1000000000000000000000000000000000000000",
+                            "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x0150" : "0x40",
+                            "0x0152" : "0x26",
+                            "0x0154" : "0x01",
+                            "0x02" : "0x01",
+                            "0x03" : "0x01",
+                            "0x04" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json
index b11eca17d..b22d70db2 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesHomestead/callcodecallcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,112 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0x4563918244fca3b9"
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0x4563918244fcab75"
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0x29a2241af634ab75"
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                        "balance" : "0x29a2241af634ab75"
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-- 
cgit v1.2.3