update stSystemOperations fillers

65 files changed, 90 insertions, 90 deletions

diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcalls0Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcalls0Filler.json
index 3f01a9b0b..903dbe9e7 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcalls0Filler.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcalls0Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
@@ -69,4 +69,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcalls1Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcalls1Filler.json
index fd655f21c..4aae22fce 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcalls1Filler.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcalls1Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
@@ -69,4 +69,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcalls2Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcalls2Filler.json
index a526cce3d..790a29187 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcalls2Filler.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcalls2Filler.json
@@ -35,7 +35,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP150", "EIP158"],
+                "network" : ["EIP150", ">=EIP158"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcalls3Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcalls3Filler.json
index d5e58eef9..4f07774e0 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcalls3Filler.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcalls3Filler.json
@@ -35,7 +35,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP150", "EIP158"],
+                "network" : ["EIP150", ">=EIP158"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcallsSuicide0Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcallsSuicide0Filler.json
index a60c1abf5..c7f585d33 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcallsSuicide0Filler.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcallsSuicide0Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                         "storage" : {
@@ -64,4 +64,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcallsSuicide1Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcallsSuicide1Filler.json
index 466dce4b6..05e3be762 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcallsSuicide1Filler.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/ABAcallsSuicide1Filler.json
@@ -38,7 +38,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP150", "EIP158"],
+                "network" : ["EIP150", ">=EIP158"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/Call10Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/Call10Filler.json
index dfb21de6a..20a599c0b 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/Call10Filler.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/Call10Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb0Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb0Filler.json
index d91ba4c70..58571f641 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb0Filler.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb0Filler.json
@@ -34,7 +34,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP150", "EIP158"],
+                "network" : ["EIP150", ">=EIP158"],
                 "result" : {
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb0_OOG_atMaxCallDepthFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb0_OOG_atMaxCallDepthFiller.json
index 5a2b3c2ec..46e7248e3 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb0_OOG_atMaxCallDepthFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb0_OOG_atMaxCallDepthFiller.json
@@ -31,7 +31,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP150", "EIP158"],
+                "network" : ["EIP150", ">=EIP158"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb1Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb1Filler.json
index 1f821c160..c72aa8f3e 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb1Filler.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb1Filler.json
@@ -31,7 +31,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP150", "EIP158"],
+                "network" : ["EIP150", ">=EIP158"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb2Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb2Filler.json
index 0476421b1..b8784bbe5 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb2Filler.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb2Filler.json
@@ -31,7 +31,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP150", "EIP158"],
+                "network" : ["EIP150", ">=EIP158"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb3Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb3Filler.json
index 5d19f437f..a9409ac58 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb3Filler.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBomb3Filler.json
@@ -29,7 +29,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP150", "EIP158"],
+                "network" : ["EIP150", ">=EIP158"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBombLog2Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBombLog2Filler.json
index 7fab89910..be8e6736d 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBombLog2Filler.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBombLog2Filler.json
@@ -34,7 +34,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP150", "EIP158"],
+                "network" : ["EIP150", ">=EIP158"],
                 "result" : {
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBombLogFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBombLogFiller.json
index 8ab3230f7..cb52e2238 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBombLogFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallRecursiveBombLogFiller.json
@@ -34,7 +34,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP150", "EIP158"],
+                "network" : ["EIP150", ">=EIP158"],
                 "result" : {
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistrator0Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistrator0Filler.json
index a94289690..0ee48e819 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistrator0Filler.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistrator0Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "0",
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorAddressTooBigLeftFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorAddressTooBigLeftFiller.json
index d312ae200..7171d5e48 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorAddressTooBigLeftFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorAddressTooBigLeftFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "0",
@@ -64,4 +64,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorAddressTooBigRightFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorAddressTooBigRightFiller.json
index a98b536bc..e541bcf45 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorAddressTooBigRightFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorAddressTooBigRightFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "0",
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorMemOOGAndInsufficientBalanceFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorMemOOGAndInsufficientBalanceFiller.json
index f7bce201c..fad61844b 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorMemOOGAndInsufficientBalanceFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorMemOOGAndInsufficientBalanceFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "0",
@@ -64,4 +64,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory0Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory0Filler.json
index c2d7af54b..8bbbed4ec 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory0Filler.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory0Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "0",
@@ -64,4 +64,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory1Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory1Filler.json
index 70e8c8121..68ef1e41b 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory1Filler.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorNotMuchMemory1Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "0",
@@ -64,4 +64,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorOutOfGasFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorOutOfGasFiller.json
index 7edc9dc1c..282a3807c 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorOutOfGasFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorOutOfGasFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "0",
@@ -64,4 +64,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory0Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory0Filler.json
index c8b2f7c9d..18e5f6468 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory0Filler.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory0Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "0",
@@ -64,4 +64,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory1Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory1Filler.json
index 2f7e14957..ce5eb6fcb 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory1Filler.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory1Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "0",
@@ -64,4 +64,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory2Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory2Filler.json
index d84bdf3d2..da525b5c0 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory2Filler.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorTooMuchMemory2Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "0",
@@ -64,4 +64,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorZeorSizeMemExpansionFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorZeorSizeMemExpansionFiller.json
index 7eaa9ab4d..32e2fb15b 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorZeorSizeMemExpansionFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToNameRegistratorZeorSizeMemExpansionFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "0",
@@ -64,4 +64,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToReturn1Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToReturn1Filler.json
index 46501675f..7176100ae 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToReturn1Filler.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToReturn1Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "0",
@@ -64,4 +64,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToReturn1ForDynamicJump0Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToReturn1ForDynamicJump0Filler.json
index 4d636385b..7e680493d 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToReturn1ForDynamicJump0Filler.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToReturn1ForDynamicJump0Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "0",
@@ -64,4 +64,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToReturn1ForDynamicJump1Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToReturn1ForDynamicJump1Filler.json
index 3f82648d2..eb13f1482 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToReturn1ForDynamicJump1Filler.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/CallToReturn1ForDynamicJump1Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "0",
@@ -64,4 +64,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/CalltoReturn2Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/CalltoReturn2Filler.json
index ab93844c7..cf04eec57 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/CalltoReturn2Filler.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/CalltoReturn2Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "0",
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/CreateHashCollisionFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/CreateHashCollisionFiller.json
index fd2ae5835..a61a6f7e8 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/CreateHashCollisionFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/CreateHashCollisionFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/PostToReturn1Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/PostToReturn1Filler.json
index 2e1d7dd09..83cd94026 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/PostToReturn1Filler.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/PostToReturn1Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/TestNameRegistratorFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/TestNameRegistratorFiller.json
index c7308b59d..9e365959d 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/TestNameRegistratorFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/TestNameRegistratorFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
@@ -57,4 +57,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/balanceInputAddressTooBigFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/balanceInputAddressTooBigFiller.json
index fb71b9dd5..2d14d7a12 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/balanceInputAddressTooBigFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/balanceInputAddressTooBigFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "0",
@@ -57,4 +57,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/callValueFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/callValueFiller.json
index a81c21cf6..c1d0ee536 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/callValueFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/callValueFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/callcodeTo0Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/callcodeTo0Filler.json
index 150c93a46..568ba83b0 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/callcodeTo0Filler.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/callcodeTo0Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "0",
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/callcodeToNameRegistrator0Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/callcodeToNameRegistrator0Filler.json
index 6f81d79b7..96c11d2e3 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/callcodeToNameRegistrator0Filler.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/callcodeToNameRegistrator0Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
@@ -63,4 +63,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigLeftFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigLeftFiller.json
index cdc9c0d23..bd2f94ae2 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigLeftFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigLeftFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
@@ -63,4 +63,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigRightFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigRightFiller.json
index 86a3af05d..1ddec023d 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigRightFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/callcodeToNameRegistratorAddresTooBigRightFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/callcodeToNameRegistratorZeroMemExpanionFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/callcodeToNameRegistratorZeroMemExpanionFiller.json
index fab1c4b93..4ab291aae 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/callcodeToNameRegistratorZeroMemExpanionFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/callcodeToNameRegistratorZeroMemExpanionFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
@@ -63,4 +63,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/callcodeToReturn1Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/callcodeToReturn1Filler.json
index 5ff63f314..2bf5d6aae 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/callcodeToReturn1Filler.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/callcodeToReturn1Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "0",
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/callerAccountBalanceFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/callerAccountBalanceFiller.json
index 1c46537e3..a9c372ad9 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/callerAccountBalanceFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/callerAccountBalanceFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorFiller.json
index d51c6f724..c49dd5ed7 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "1",
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorOOG_MemExpansionOOVFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorOOG_MemExpansionOOVFiller.json
index c3bd7266e..4eb341e3f 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorOOG_MemExpansionOOVFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorOOG_MemExpansionOOVFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "0",
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds0Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds0Filler.json
index 135a1adf9..7275c516e 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds0Filler.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds0Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "0",
@@ -57,4 +57,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds1Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds1Filler.json
index d5f0d660e..4ca35d0ab 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds1Filler.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorOutOfMemoryBonds1Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "0",
@@ -57,4 +57,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorValueTooHighFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorValueTooHighFiller.json
index c191f56c2..f66c77cbd 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorValueTooHighFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorValueTooHighFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "d2571607e241ecf590ed94b12d87c94babe36db6" : {
                         "shouldnotexist" : "1"
@@ -55,4 +55,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorZeroMem2Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorZeroMem2Filler.json
index 65012586a..46861b162 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorZeroMem2Filler.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorZeroMem2Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "1",
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorZeroMemExpansionFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorZeroMemExpansionFiller.json
index 50a9d6d99..9258a06cc 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorZeroMemExpansionFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorZeroMemExpansionFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "1",
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorZeroMemFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorZeroMemFiller.json
index 719294dd3..5168086cc 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorZeroMemFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/createNameRegistratorZeroMemFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "1",
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/createWithInvalidOpcodeFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/createWithInvalidOpcodeFiller.json
index 1220808a1..bb9ec0131 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/createWithInvalidOpcodeFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/createWithInvalidOpcodeFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "nonce" : "1",
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/currentAccountBalanceFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/currentAccountBalanceFiller.json
index e99ce1198..a9c5cf34a 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/currentAccountBalanceFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/currentAccountBalanceFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                         "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/extcodecopyFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/extcodecopyFiller.json
index c01c2d37b..422716562 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/extcodecopyFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/extcodecopyFiller.json
@@ -43,7 +43,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP150", "EIP158"],
+                "network" : ["EIP150", ">=EIP158"],
                 "result" : {
                     "00000000002147c39fd6b5c19b7b89fc003e6b16" : {
                         "balance" : "0x2a6bb607",
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/return0Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/return0Filler.json
index aaa81f0d4..f93a05896 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/return0Filler.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/return0Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                         "balance" : "21018"
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/return1Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/return1Filler.json
index 7730dbf16..b1e425de0 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/return1Filler.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/return1Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                         "balance" : "21018"
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/return2Filler.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/return2Filler.json
index 91daac67c..b7c1b01e8 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/return2Filler.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/return2Filler.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                         "balance" : "21021"
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideAddressFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideAddressFiller.json
index 4daaf0e1f..60f90d03c 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideAddressFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideAddressFiller.json
@@ -31,7 +31,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP150", "EIP158"],
+                "network" : ["EIP150", ">=EIP158"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "balance" : "999999999999876996"
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCallerAddresTooBigLeftFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCallerAddresTooBigLeftFiller.json
index 97b2fa689..953454bac 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCallerAddresTooBigLeftFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCallerAddresTooBigLeftFiller.json
@@ -32,7 +32,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP150", "EIP158"],
+                "network" : ["EIP150", ">=EIP158"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "balance" : "1999999999999976996",
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCallerAddresTooBigRightFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCallerAddresTooBigRightFiller.json
index c44e78d78..7d787e370 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCallerAddresTooBigRightFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCallerAddresTooBigRightFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "4f5374fce5edbc8e2a8697c15331677e6ebf0baa" : {
                         "balance" : "1000000000000100000"
@@ -55,4 +55,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCallerFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCallerFiller.json
index cac829be5..ffda8fc24 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCallerFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCallerFiller.json
@@ -32,7 +32,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP150", "EIP158"],
+                "network" : ["EIP150", ">=EIP158"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "balance" : "1999999999999976996",
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCoinbaseFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCoinbaseFiller.json
index 4a1cffdc1..be690d4d3 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCoinbaseFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideCoinbaseFiller.json
@@ -29,7 +29,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP150", "EIP158"],
+                "network" : ["EIP150", ">=EIP158"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "balance" : "1999999999999986998",
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideNotExistingAccountFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideNotExistingAccountFiller.json
index cc81f0187..62b8726b4 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideNotExistingAccountFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideNotExistingAccountFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "aa1722f3947def4cf144679da39c4c32bdc35681" : {
                         "balance" : "1000000000000100000"
@@ -55,4 +55,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideOriginFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideOriginFiller.json
index 9a96c41ab..2e2805441 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideOriginFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideOriginFiller.json
@@ -31,7 +31,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP150", "EIP158"],
+                "network" : ["EIP150", ">=EIP158"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "balance" : "1999999999999976996"
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideSendEtherPostDeathFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideSendEtherPostDeathFiller.json
index a1e5e6e9f..e39a34e98 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideSendEtherPostDeathFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideSendEtherPostDeathFiller.json
@@ -35,7 +35,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP150", "EIP158"],
+                "network" : ["EIP150", ">=EIP158"],
                 "result" : {
                     "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                         "balance" : "14270"
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideSendEtherToMeFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideSendEtherToMeFiller.json
index 957d15027..6271e140d 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideSendEtherToMeFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/suicideSendEtherToMeFiller.json
@@ -32,7 +32,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["EIP150", "EIP158"],
+                "network" : ["EIP150", ">=EIP158"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "balance" : "999999999999886999",
diff --git a/src/GeneralStateTestsFiller/stSystemOperationsTest/testRandomTestFiller.json b/src/GeneralStateTestsFiller/stSystemOperationsTest/testRandomTestFiller.json
index 088060ece..6ef3b31e4 100644
--- a/src/GeneralStateTestsFiller/stSystemOperationsTest/testRandomTestFiller.json
+++ b/src/GeneralStateTestsFiller/stSystemOperationsTest/testRandomTestFiller.json
@@ -15,7 +15,7 @@
                     "gas" : -1,
                     "value" : -1
                 },
-                "network" : ["ALL"],
+                "network" : [">=Frontier"],
                 "result" : {
                     "0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
                         "nonce" : "2",