Fixing errors from JSONSchema/st-filler-schema.json

60 files changed, 84 insertions, 84 deletions

diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_ABAcalls2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_ABAcalls2Filler.json
index 11efeddb5..393936710 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_ABAcalls2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_ABAcalls2Filler.json
@@ -19,12 +19,12 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0"
+                            "0x00" : "0x00"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                         "storage" : {
-                            "0x" : "0"
+                            "0x00" : "0x00"
                         }
                     }
                 }
@@ -45,12 +45,12 @@
 		    },
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0x01"
+                            "0x00" : "0x01"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                         "storage" : {
-                            "0x" : "0"
+                            "0x00" : "0x00"
                         }
                     }
                 }
@@ -71,12 +71,12 @@
 		    },
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0x00"
+                            "0x00" : "0x00"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                         "storage" : {
-                            "0x" : "0"
+                            "0x00" : "0x00"
                         }
                     }
                 }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_ABAcalls3Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_ABAcalls3Filler.json
index cbee1f721..c8fdb822f 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_ABAcalls3Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_ABAcalls3Filler.json
@@ -19,12 +19,12 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0"
+                            "0x00" : "0x00"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                         "storage" : {
-                            "0x" : "0"
+                            "0x00" : "0x00"
                         }
                     }
                 }
@@ -45,12 +45,12 @@
                     },
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0x01"
+                            "0x00" : "0x01"
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                         "storage" : {
-                            "0x" : "0"
+                            "0x00" : "0x00"
                         }
                     }
                 }
@@ -71,12 +71,12 @@
                     },
                     "195e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0"
+                            "0x00" : "0x00"
                         }
                     },
                     "245304eb96065b2a98b57a48a06ae28d285a71b5" : {
                         "storage" : {
-                            "0x" : "0"
+                            "0x00" : "0x00"
                         }
                     }
                 }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_ABAcallsSuicide0Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_ABAcallsSuicide0Filler.json
index 5f798b120..963f3a310 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_ABAcallsSuicide0Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_ABAcallsSuicide0Filler.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                         "storage" : {
-                            "0x26" : "0"
+                            "0x26" : "0x00"
                         }
                     },
 		    "1000000000000000000000000000000000000000" : {
@@ -46,7 +46,7 @@
 		     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                         "storage" : {
-                            "0x26" : "0"
+                            "0x26" : "0x00"
                         }
                     }
                 }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json
index 76272edbd..58f2c3aa3 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_ThenStoreThenReturnFiller.json
@@ -23,25 +23,25 @@
 		    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
 			"balance" : "0",
 		        "storage" : {
-			    "0x01" : "0"
+			    "0x01" : "0x00"
 		        }
 		    },
 		    "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
 			"balance" : "10",
 		        "storage" : {
-			    "0x01" : "0"
+			    "0x01" : "0x00"
 		        }
 		    },
 		    "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
 			"balance" : "0",
 		        "storage" : {
-			    "0x01" : "0"
+			    "0x01" : "0x00"
 		        }
 		    },
 		    "194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
 			"balance" : "0",
 		        "storage" : {
-			    "0x01" : "0"
+			    "0x01" : "0x00"
 		        }
 		    }
                 }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_WithValueFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_WithValueFiller.json
index d234320c9..778bbdc04 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_WithValueFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_ContractSuicideDuringInit_WithValueFiller.json
@@ -23,7 +23,7 @@
 		    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
 			"balance" : "10",
 		        "storage" : {
-			    "0x01" : "0"
+			    "0x01" : "0x00"
 		        }
 		    }
                 }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_EmptyContractWithStorageAndCallIt_0weiFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_EmptyContractWithStorageAndCallIt_0weiFiller.json
index 01d0d5732..26c86cb66 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_EmptyContractWithStorageAndCallIt_0weiFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CREATE_EmptyContractWithStorageAndCallIt_0weiFiller.json
@@ -31,7 +31,7 @@
 		    },
 		    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
 		        "storage" : {
-			   "0x01" : "12"
+			   "0x01" : "0x0c"
 			}
 		    }
                 }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_Call10Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_Call10Filler.json
index e5023609b..e76eda65a 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_Call10Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_Call10Filler.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "storage" : {
-                            "0x00" : "1",
+                            "0x00" : "0x01",
                             "0x01" : "0x0a"
                         }
                     },
@@ -41,8 +41,8 @@
                 "result" : {
                     "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "storage" : {
-                            "0x00" : "0",
-                            "0x01" : "0"
+                            "0x00" : "0x00",
+                            "0x01" : "0x00"
                         }
                     },
 		    "1000000000000000000000000000000000000000" : {
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_Call50000bytesContract50_1Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_Call50000bytesContract50_1Filler.json
index ff96ee657..d78a9f1d2 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_Call50000bytesContract50_1Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_Call50000bytesContract50_1Filler.json
@@ -25,7 +25,7 @@
                     "aaa50000fce5edbc8e2a8697c15331677e6ebf0b" : {                        
                         "nonce" : "0x00",
                         "storage" : {
-                            "0x00" : "0"
+                            "0x00" : "0x00"
                         }
                     },
                     "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -67,7 +67,7 @@
                     "aaa50000fce5edbc8e2a8697c15331677e6ebf0b" : {                        
                         "nonce" : "0x00",
                         "storage" : {
-                            "0x00" : "0"
+                            "0x00" : "0x00"
                         }
                     },
                     "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallContractToCreateContractAndCallItOOGFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallContractToCreateContractAndCallItOOGFiller.json
index 4bce89a2f..c63e3f2ec 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallContractToCreateContractAndCallItOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallContractToCreateContractAndCallItOOGFiller.json
@@ -20,7 +20,7 @@
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "1",
                         "storage" : {
-                            "0x" : "0xd2571607e241ecf590ed94b12d87c94babe36db6",
+                            "0x00" : "0xd2571607e241ecf590ed94b12d87c94babe36db6",
 			    "0x02" : "0x03"
                         }
                     },
@@ -31,7 +31,7 @@
                         "balance" : "1",
                         "nonce" : "1",
                         "storage" : {
-                            "0x" : "0x0c"
+                            "0x00" : "0x0c"
                         }
                     }
                 }
@@ -47,7 +47,7 @@
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "0",
                         "storage" : {
-                            "0x" : "0x00",
+                            "0x00" : "0x00",
 			    "0x02" : "0x00"
                         }
                     },
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallContractToCreateContractOOGBonusGasFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallContractToCreateContractOOGBonusGasFiller.json
index fb317988c..c95c9a5ef 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallContractToCreateContractOOGBonusGasFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallContractToCreateContractOOGBonusGasFiller.json
@@ -20,7 +20,7 @@
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "1",
                         "storage" : {
-                            "0x" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
+                            "0x00" : "0xd2571607e241ecf590ed94b12d87c94babe36db6"
                         }
                     },
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -30,7 +30,7 @@
                         "balance" : "1",
                         "nonce" : "1",
                         "storage" : {
-                            "0x" : "0x0c",
+                            "0x00" : "0x0c",
 			    "0x01" : "0x00"
                         }
                     }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json
index 372e6eb49..4b017d2e7 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallContractToCreateContractWhichWouldCreateContractIfCalledFiller.json
@@ -20,7 +20,7 @@
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "1",
                         "storage" : {
-                            "0x" : "0xd2571607e241ecf590ed94b12d87c94babe36db6",
+                            "0x00" : "0xd2571607e241ecf590ed94b12d87c94babe36db6",
 			    "0x01" : "0x00"
                         }
                     },
@@ -34,7 +34,7 @@
                         "balance" : "1",
                         "nonce" : "1",
                         "storage" : {
-                            "0x" : "0x0c"
+                            "0x00" : "0x0c"
                         }
                     }
                 }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover0Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover0Filler.json
index 363f857a1..af8cbe769 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover0Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover0Filler.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                             "0x01" : "0x01",
                             "0x02" : "0x01"
                         }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover0_completeReturnValueFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover0_completeReturnValueFiller.json
index d88cabea1..18cb76924 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover0_completeReturnValueFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover0_completeReturnValueFiller.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                             "0x02" : "0x01"
                         }
                     }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover0_gas3000Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover0_gas3000Filler.json
index 069ce38a8..3c2e44946 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover0_gas3000Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover0_gas3000Filler.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                             "0x01" : "0x01",
                             "0x02" : "0x01"
                         }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover0_overlappingInputOutputFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover0_overlappingInputOutputFiller.json
index b7554aa12..92d2c480a 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover0_overlappingInputOutputFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover0_overlappingInputOutputFiller.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                             "0x01" : "0x01",
                             "0x02" : "0x01"
                         }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover3Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover3Filler.json
index e360889a6..93f2456ca 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover3Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover3Filler.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0xe4319f4b631c6d0fcfc84045dbcb676865fe5e13",
+                            "0x00" : "0xe4319f4b631c6d0fcfc84045dbcb676865fe5e13",
                             "0x02" : "0x01"
                         }
                     }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover80Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover80Filler.json
index fb83b4fd8..0f44c07db 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover80Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecover80Filler.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0x00",
+                            "0x00" : "0x00",
                             "0x01" : "0x00",
                             "0x02" : "0x01"
                         }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecoverCheckLengthFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecoverCheckLengthFiller.json
index 465587faf..d8940fb6b 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecoverCheckLengthFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecoverCheckLengthFiller.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                             "0x01" : "0xa0",
                             "0x02" : "0x01"
                         }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecoverCheckLengthWrongVFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecoverCheckLengthWrongVFiller.json
index f0087913f..b818a3f87 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecoverCheckLengthWrongVFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecoverCheckLengthWrongVFiller.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0x1122334455667788990011223344556677889900112233445566778899001122",
+                            "0x00" : "0x1122334455667788990011223344556677889900112233445566778899001122",
                             "0x01" : "0xa0",
                             "0x02" : "0x01"
                         }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecoverH_prefixed0Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecoverH_prefixed0Filler.json
index a40e0ae09..72cdd3b1d 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecoverH_prefixed0Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecoverH_prefixed0Filler.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0xa0b29af6a56d6cfef6415cb195ccbe540e006d0a",
+                            "0x00" : "0xa0b29af6a56d6cfef6415cb195ccbe540e006d0a",
                             "0x01" : "0x00",
                             "0x02" : "0x01"
                         }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecoverR_prefixed0Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecoverR_prefixed0Filler.json
index c6379f56a..dcba852ba 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecoverR_prefixed0Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecoverR_prefixed0Filler.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0x00",
+                            "0x00" : "0x00",
                             "0x01" : "0x00",
                             "0x02" : "0x01"
                         }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecoverS_prefixed0Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecoverS_prefixed0Filler.json
index 0ff4049e1..05b9986db 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecoverS_prefixed0Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecoverS_prefixed0Filler.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0xb4950a7fad428434b11c357fa6d4b4bcd3096a5d",
+                            "0x00" : "0xb4950a7fad428434b11c357fa6d4b4bcd3096a5d",
                             "0x01" : "0x00",
                             "0x02" : "0x01"
                         }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecoverV_prefixed0Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecoverV_prefixed0Filler.json
index 20f347fe8..ca2aff61c 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecoverV_prefixed0Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallEcrecoverV_prefixed0Filler.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                            "0x00" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
                             "0x01" : "0x01",
                             "0x02" : "0x01"
                         }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentitiy_1Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentitiy_1Filler.json
index 179e154e6..61c8e9f3d 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentitiy_1Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentitiy_1Filler.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0x00",
+                            "0x00" : "0x00",
                             "0x02" : "0x01"
                         }
                     }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_1_nonzeroValueFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_1_nonzeroValueFiller.json
index db6f0bfeb..0f942c804 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_1_nonzeroValueFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_1_nonzeroValueFiller.json
@@ -22,7 +22,7 @@
                     },
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0x00",
+                            "0x00" : "0x00",
                             "0x02" : "0x01"
                         }
                     }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_2Filler.json
index 8937739c0..3ea0187f1 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_2Filler.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0x000000000000000000000000000000000000000000000000000000f34578907f",
+                            "0x00" : "0x000000000000000000000000000000000000000000000000000000f34578907f",
                             "0x02" : "0x01"
                         }
                     }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_3Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_3Filler.json
index da04b76c3..56dd6036c 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_3Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_3Filler.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0x000000000000000000000000000000000000000000000000000000f34578907f",
+                            "0x00" : "0x000000000000000000000000000000000000000000000000000000f34578907f",
                             "0x02" : "0x01"
                         }
                     }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_4Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_4Filler.json
index 4fa6b965a..006d4d4f4 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_4Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_4Filler.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                            "0x00" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
                             "0x02" : "0x01"
                         }
                     }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_4_gas17Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_4_gas17Filler.json
index fce0159b2..35a164ead 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_4_gas17Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_4_gas17Filler.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                            "0x00" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
                             "0x02" : "0x00"
                         }
                     }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_4_gas18Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_4_gas18Filler.json
index c3da0e8f9..d31811d46 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_4_gas18Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_4_gas18Filler.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+                            "0x00" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
                             "0x02" : "0x01"
                         }
                     }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_5Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_5Filler.json
index 345988ead..f581b2a79 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_5Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallIdentity_5Filler.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+                            "0x00" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
                         }
                     }
                 }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallLoseGasOOGFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallLoseGasOOGFiller.json
index 123a2772a..a62cc3ee0 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallLoseGasOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallLoseGasOOGFiller.json
@@ -15,7 +15,7 @@
                 "result" : {
                     "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "storage" : {
-                            "0x" : "0x01",
+                            "0x00" : "0x01",
                             "0x02" : "0x03e9"
                         }
                     }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallRipemd160_1Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallRipemd160_1Filler.json
index 8968a86b1..cdcba9f7b 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallRipemd160_1Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallRipemd160_1Filler.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0x9c1185a5c5e9fc54612808977ee8f548b2258d31",
+                            "0x00" : "0x9c1185a5c5e9fc54612808977ee8f548b2258d31",
                             "0x02" : "0x01"
                         }
                     }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallRipemd160_4_gas719Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallRipemd160_4_gas719Filler.json
index b61a5fece..aa0378993 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallRipemd160_4_gas719Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallRipemd160_4_gas719Filler.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+                            "0x00" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
                         }
                     }
                 }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallRipemd160_5Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallRipemd160_5Filler.json
index c24d68e99..79b3323c6 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallRipemd160_5Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallRipemd160_5Filler.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+                            "0x00" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
                         }
                     }
                 }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_1Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_1Filler.json
index cfe5de2ae..b7d685e60 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_1Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_1Filler.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+                            "0x00" : "0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
                             "0x02" : "0x01"
                         }
                     }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_1_nonzeroValueFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_1_nonzeroValueFiller.json
index 631722a8c..4ab22ccdd 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_1_nonzeroValueFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_1_nonzeroValueFiller.json
@@ -22,7 +22,7 @@
                     },
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
+                            "0x00" : "0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855",
                             "0x02" : "0x01"
                         }
                     }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_2Filler.json
index de2ebc9e9..50318c9fc 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_2Filler.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0xcb39b3bde22925b2f931111130c774761d8895e0e08437c9b396c1e97d10f34d",
+                            "0x00" : "0xcb39b3bde22925b2f931111130c774761d8895e0e08437c9b396c1e97d10f34d",
                             "0x02" : "0x01"
                         }
                     }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_3Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_3Filler.json
index f750e51c3..3b1e2985a 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_3Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_3Filler.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0x7392925565d67be8e9620aacbcfaecd8cb6ec58d709d25da9eccf1d08a41ce35",
+                            "0x00" : "0x7392925565d67be8e9620aacbcfaecd8cb6ec58d709d25da9eccf1d08a41ce35",
                             "0x02" : "0x01"
                         }
                     }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_3_postfix0Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_3_postfix0Filler.json
index cf9daa150..33b48c5d8 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_3_postfix0Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_3_postfix0Filler.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0x3b745a1c00d035c334f358d007a430e4cf0ae63aa0556fb05529706de546464d",
+                            "0x00" : "0x3b745a1c00d035c334f358d007a430e4cf0ae63aa0556fb05529706de546464d",
                             "0x02" : "0x01"
                         }
                     }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_3_prefix0Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_3_prefix0Filler.json
index bf7653d8f..96a2e0bc2 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_3_prefix0Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_3_prefix0Filler.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0x7392925565d67be8e9620aacbcfaecd8cb6ec58d709d25da9eccf1d08a41ce35",
+                            "0x00" : "0x7392925565d67be8e9620aacbcfaecd8cb6ec58d709d25da9eccf1d08a41ce35",
                             "0x02" : "0x01"
                         }
                     }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_4Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_4Filler.json
index 118d42cbf..77c67a9b1 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_4Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_4Filler.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0xaf9613760f72635fbdb44a5a0a63c39f12af30f950a6ee5c971be188e89c4051",
+                            "0x00" : "0xaf9613760f72635fbdb44a5a0a63c39f12af30f950a6ee5c971be188e89c4051",
                             "0x02" : "0x01"
                         }
                     }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_4_gas99Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_4_gas99Filler.json
index fc606bf53..47ea4ad90 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_4_gas99Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_4_gas99Filler.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0xaf9613760f72635fbdb44a5a0a63c39f12af30f950a6ee5c971be188e89c4051",
+                            "0x00" : "0xaf9613760f72635fbdb44a5a0a63c39f12af30f950a6ee5c971be188e89c4051",
                             "0x02" : "0x01"
                         }
                     }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_5Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_5Filler.json
index be2b97952..47909fea8 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_5Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallSha256_5Filler.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
+                            "0x00" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
                         }
                     }
                 }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CallToNameRegistrator0Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CallToNameRegistrator0Filler.json
index cc3b356e7..5efe524cc 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CallToNameRegistrator0Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CallToNameRegistrator0Filler.json
@@ -20,7 +20,7 @@
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "0",
                         "storage" : {
-                            "0x" : "0x00"
+                            "0x00" : "0x00"
                         }
                     }
                 }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_CalltoReturn2Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_CalltoReturn2Filler.json
index f6d9cb1f2..a98df3e13 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_CalltoReturn2Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_CalltoReturn2Filler.json
@@ -20,7 +20,7 @@
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "0",
                         "storage" : {
-                            "0x" : "0x01",
+                            "0x00" : "0x01",
 			    "0x01" : "0x3700ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
                         }
                     }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_InternlCallStoreClearsOOGFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_InternlCallStoreClearsOOGFiller.json
index 9fb17d1b3..90064915a 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_InternlCallStoreClearsOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_InternlCallStoreClearsOOGFiller.json
@@ -20,7 +20,7 @@
                     "0000000000000000000000000000000000000000" : {
                         "balance" : "0",
                         "storage" : {
-                            "0x" : "0x0c",
+                            "0x00" : "0x0c",
                             "0x01" : "0x0c",
                             "0x02" : "0x0c",
                             "0x03" : "0x0c",
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_ReturnTestFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_ReturnTestFiller.json
index 53539a429..0625c3b95 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_ReturnTestFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_ReturnTestFiller.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "194f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "storage" : {
-                            "0x" : "0x15"
+                            "0x00" : "0x15"
                         }
                     }
                 }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_call_value_inheritFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_call_value_inheritFiller.json
index 65d6497b2..eb089478b 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_call_value_inheritFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_call_value_inheritFiller.json
@@ -19,8 +19,8 @@
                 "result" : {
                     "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "storage" : {
-                            "0x0" : "0x1",
-                            "0x1" : "0x0"
+                            "0x00" : "0x01",
+                            "0x01" : "0x00"
                         }
                     }
                 }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_call_value_inherit_from_callFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_call_value_inherit_from_callFiller.json
index 0c409493c..983d4b883 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_call_value_inherit_from_callFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_call_value_inherit_from_callFiller.json
@@ -19,8 +19,8 @@
                 "result" : {
                     "094f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "storage" : {
-                            "0x0" : "0x1",
-                            "0x1" : "0x0"
+                            "0x00" : "0x01",
+                            "0x01" : "0x00"
                         }
                     }
                 }
@@ -40,7 +40,7 @@
                 "code" : "{ [[0]] (STATICCALL 50000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 32) [[1]] (MLOAD 0) }",
                 "nonce" : "0",
                 "storage" : {
-                    "0x1": "0x01"
+                    "0x01": "0x01"
                 }
             },
             "c8b90f8d999d9d9988209481999a9889098a89a0" : {
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMBeforeFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMBeforeFiller.json
index 1772d45c5..23d778d08 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMBeforeFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_OOGMBeforeFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Byzantium",
+                "network" : ["Byzantium"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_SuicideEndFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_SuicideEndFiller.json
index b29d680de..1a4fcc1a4 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_SuicideEndFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcallcodecallcode_011_SuicideEndFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : "Byzantium",
+                "network" : ["Byzantium"],
                 "result" : {
                     "1000000000000000000000000000000000000000" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log0_logMemsizeZeroFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_log0_logMemsizeZeroFiller.json
index 35b12b31b..4661e0f4c 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log0_logMemsizeZeroFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_log0_logMemsizeZeroFiller.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0x00"
+                            "0x00" : "0x00"
                         }
                     }
                 }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log0_nonEmptyMemFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_log0_nonEmptyMemFiller.json
index 309b43aa0..cacab3574 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log0_nonEmptyMemFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_log0_nonEmptyMemFiller.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0x00"
+                            "0x00" : "0x00"
                         }
                     }
                 }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log0_nonEmptyMem_logMemSize1Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_log0_nonEmptyMem_logMemSize1Filler.json
index 21b4f300d..65eb48569 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log0_nonEmptyMem_logMemSize1Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_log0_nonEmptyMem_logMemSize1Filler.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0x00"
+                            "0x00" : "0x00"
                         }
                     }
                 }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log0_nonEmptyMem_logMemSize1_logMemStart31Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_log0_nonEmptyMem_logMemSize1_logMemStart31Filler.json
index 3d886748d..4d652dcef 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log0_nonEmptyMem_logMemSize1_logMemStart31Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_log0_nonEmptyMem_logMemSize1_logMemStart31Filler.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0x00"
+                            "0x00" : "0x00"
                         }
                     }
                 }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log1_MaxTopicFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_log1_MaxTopicFiller.json
index 37dc3526b..622694320 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log1_MaxTopicFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_log1_MaxTopicFiller.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0x00"
+                            "0x00" : "0x00"
                         }
                     }
                 }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log1_emptyMemFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_log1_emptyMemFiller.json
index 731173681..15459b382 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log1_emptyMemFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_log1_emptyMemFiller.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0x00"
+                            "0x00" : "0x00"
                         }
                     }
                 }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log1_logMemsizeZeroFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_log1_logMemsizeZeroFiller.json
index 1e9f71973..993bccd1f 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log1_logMemsizeZeroFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_log1_logMemsizeZeroFiller.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0x00"
+                            "0x00" : "0x00"
                         }
                     }
                 }
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_log_CallerFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_log_CallerFiller.json
index eb6298743..88cd4b8f8 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_log_CallerFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_log_CallerFiller.json
@@ -19,7 +19,7 @@
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
-                            "0x" : "0x00"
+                            "0x00" : "0x00"
                         }
                     }
                 }