97 files changed, 108 insertions, 98 deletions
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest109Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest109BCFiller.json
index 851352422..efadbfebb 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest109Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest109BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest109" : {
+    "randomStatetest109BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest113Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest113BCFiller.json
index 1a64ec2e8..a00e129b5 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest113Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest113BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest113" : {
+    "randomStatetest113BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest127Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest127BCFiller.json
index df1f70493..ce636297a 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest127Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest127BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest127" : {
+    "randomStatetest127BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest128Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest128BCFiller.json
index b29273ffd..9f489ce7f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest128Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest128BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest128" : {
+    "randomStatetest128BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest132Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest132BCFiller.json
index 268b21931..3e0cf388f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest132Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest132BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest132" : {
+    "randomStatetest132BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest140Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest140BCFiller.json
index 7f55b9989..4e02d89e2 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest140Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest140BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest140" : {
+    "randomStatetest140BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest141Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest141BCFiller.json
index 4a51e89c7..4d32187a0 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest141Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest141BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest141" : {
+    "randomStatetest141BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest152Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest152BCFiller.json
index fb5a716dd..c2425a9bb 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest152Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest152BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest152" : {
+    "randomStatetest152BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest165Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest165BCFiller.json
index 24a7ef7fb..0f3c5cf35 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest165Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest165BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest165" : {
+    "randomStatetest165BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest168Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest168BCFiller.json
index e626fb324..4718051cf 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest168Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest168BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest168" : {
+    "randomStatetest168BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest181Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest181BCFiller.json
index c7b4fc959..2359e51eb 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest181Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest181BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest181" : {
+    "randomStatetest181BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest182Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest182BCFiller.json
index 6c4fbd95a..cadfb39b1 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest182Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest182BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest182" : {
+    "randomStatetest182BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest186Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest186BCFiller.json
index f8be2119c..37565392e 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest186Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest186BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest186" : {
+    "randomStatetest186BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest193Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest193BCFiller.json
index 6fed3bfeb..f62ed5104 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest193Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest193BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest193" : {
+    "randomStatetest193BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest203Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest203BCFiller.json
index c0d52b2bb..aecf20eee 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest203Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest203BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest203" : {
+    "randomStatetest203BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest213Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest213BCFiller.json
index c24fd255c..b3968df23 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest213Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest213BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest213" : {
+    "randomStatetest213BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest218Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest218BCFiller.json
index 0827e84a1..e8003adf5 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest218Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest218BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest218" : {
+    "randomStatetest218BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest21Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest21BCFiller.json
index 1cb4a43ec..c6247f927 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest21Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest21BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest21" : {
+    "randomStatetest21BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest224Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest224BCFiller.json
index 9056fccef..3ad0e7586 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest224Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest224BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest224" : {
+    "randomStatetest224BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest234Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest234BCFiller.json
index 6f5379beb..7e70374d7 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest234Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest234BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest234" : {
+    "randomStatetest234BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest235Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest235BCFiller.json
index 6f8115ec4..aa2fdc362 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest235Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest235BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest235" : {
+    "randomStatetest235BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest239Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest239BCFiller.json
index 9561f7f73..b14023c49 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest239Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest239BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest239" : {
+    "randomStatetest239BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest240Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest240BCFiller.json
index a7acec5ed..e32ef4925 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest240Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest240BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest240" : {
+    "randomStatetest240BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest253Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest253BCFiller.json
index b8c3d3e01..761bc394b 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest253Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest253BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest253" : {
+    "randomStatetest253BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest255Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest255BCFiller.json
index dfa312134..775155a3e 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest255Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest255BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest255" : {
+    "randomStatetest255BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest256Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest256BCFiller.json
index f3ffc6f96..073156f69 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest256Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest256BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest256" : {
+    "randomStatetest256BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest258Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest258BCFiller.json
index 7125dd5b5..6a04f854b 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest258Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest258BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest258" : {
+    "randomStatetest258BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest262Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest262BCFiller.json
index a331270ba..8f8685ab3 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest262Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest262BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest262" : {
+    "randomStatetest262BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest272Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest272BCFiller.json
index c801de8a4..2cba40711 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest272Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest272BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest272" : {
+    "randomStatetest272BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest277Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest277BCFiller.json
index b828e0d2b..678eb82d0 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest277Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest277BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest277" : {
+    "randomStatetest277BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest284Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest284BCFiller.json
index 50305883f..4f5ad0a4b 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest284Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest284BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest284" : {
+    "randomStatetest284BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest289Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest289BCFiller.json
index 4f3f614c4..adbcd6ba5 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest289Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest289BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest289" : {
+    "randomStatetest289BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest314Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest314BCFiller.json
index f6496b542..e050d33f3 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest314Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest314BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest314" : {
+    "randomStatetest314BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest317Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest317BCFiller.json
index 8fb5c6d82..7249e3c44 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest317Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest317BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest317" : {
+    "randomStatetest317BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest319Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest319BCFiller.json
index e3ac91a2d..b1f2e4b73 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest319Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest319BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest319" : {
+    "randomStatetest319BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest330Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest330BCFiller.json
index bb05edf16..f67ab0768 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest330Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest330BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest330" : {
+    "randomStatetest330BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest331Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest331BCFiller.json
index 85d97ecea..bdc7f9eeb 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest331Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest331BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest331" : {
+    "randomStatetest331BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest344Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest344BCFiller.json
index c83d2d674..a2bd310ef 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest344Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest344BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest344" : {
+    "randomStatetest344BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest34Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest34BCFiller.json
index 59de269d3..4b08c2333 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest34Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest34BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest34" : {
+    "randomStatetest34BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest35Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest35BCFiller.json
index c7e0446c1..c63d53dd7 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest35Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest35BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest35" : {
+    "randomStatetest35BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest373Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest373BCFiller.json
index 21e48b0bf..152d65fcd 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest373Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest373BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest373" : {
+    "randomStatetest373BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest374Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest374BCFiller.json
index bacc4ae1e..3386f2e63 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest374Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest374BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest374" : {
+    "randomStatetest374BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest390Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest390BCFiller.json
index 92c3e0008..5102f9ab6 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest390Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest390BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest390" : {
+    "randomStatetest390BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest392Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest392BCFiller.json
index 2e6c142ba..b9782c9a0 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest392Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest392BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest392" : {
+    "randomStatetest392BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest71Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest394BCFiller.json
index 11defae25..5028523c2 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest71Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest394BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest71" : {
+    "randomStatetest394BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest400Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest400BCFiller.json
index 7a85a37a8..1fc96b5a8 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest400Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest400BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest400" : {
+    "randomStatetest400BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest403Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest403BCFiller.json
index a99269fa3..580290020 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest403Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest403BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest403" : {
+    "randomStatetest403BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest40Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest40BCFiller.json
index a488ca465..dfca410fe 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest40Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest40BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest40" : {
+    "randomStatetest40BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest427Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest427BCFiller.json
index 9e33cf028..2dc8acc0e 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest427Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest427BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest427" : {
+    "randomStatetest427BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest431Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest431BCFiller.json
index ea9d33512..e08b900d0 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest431Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest431BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest431" : {
+    "randomStatetest431BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest432Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest432BCFiller.json
index f079470f3..a1e8d83fc 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest432Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest432BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest432" : {
+    "randomStatetest432BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest434Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest434BCFiller.json
index 9933270b1..36add8ba2 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest434Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest434BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest434" : {
+    "randomStatetest434BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest44Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest44BCFiller.json
index 5aff2bb60..9fbc4d73e 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest44Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest44BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest44" : {
+    "randomStatetest44BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest453Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest453BCFiller.json
index 6a4bf0366..a5a30c5b3 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest453Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest453BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest453" : {
+    "randomStatetest453BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest459Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest459BCFiller.json
index d04184e3e..ba5799150 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest459Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest459BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest459" : {
+    "randomStatetest459BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest463Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest463BCFiller.json
index d3bde3a13..8f9b54da6 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest463Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest463BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest463" : {
+    "randomStatetest463BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest479Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest479BCFiller.json
index 44e00fcd8..fb2e41f79 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest479Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest479BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest479" : {
+    "randomStatetest479BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest486Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest486BCFiller.json
index 847560afb..be1d081b5 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest486Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest486BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest486" : {
+    "randomStatetest486BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest490Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest490BCFiller.json
index be02955d2..c6ef2cceb 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest490Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest490BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest490" : {
+    "randomStatetest490BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest492Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest492BCFiller.json
index b1aa28f5b..b8e143149 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest492Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest492BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest492" : {
+    "randomStatetest492BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest515Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest515BCFiller.json
index e5218c1b2..12523657b 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest515Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest515BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest515" : {
+    "randomStatetest515BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest522Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest522BCFiller.json
index b4f1d45de..a0cb23f7f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest522Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest522BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest522" : {
+    "randomStatetest522BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest529Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest529BCFiller.json
index d9c16d486..ae64c0992 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest529Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest529BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest529" : {
+    "randomStatetest529BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest530Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest530BCFiller.json
index 4be2c466a..f906a5589 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest530Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest530BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest530" : {
+    "randomStatetest530BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest540Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest540BCFiller.json
index d651a383a..b8ba6d349 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest540Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest540BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest540" : {
+    "randomStatetest540BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest551Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest551BCFiller.json
index c0b955289..be9963443 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest551Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest551BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest551" : {
+    "randomStatetest551BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest557Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest557BCFiller.json
index c7e049a0a..b402578ca 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest557Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest557BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest557" : {
+    "randomStatetest557BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest561Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest561BCFiller.json
index fbd897afd..1346dd05d 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest561Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest561BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest561" : {
+    "randomStatetest561BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest568Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest568BCFiller.json
index 4c35d2854..4bbd3710d 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest568Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest568BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest568" : {
+    "randomStatetest568BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest56Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest56BCFiller.json
index cac01f457..6e2e5bd81 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest56Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest56BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest56" : {
+    "randomStatetest56BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest570Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest570BCFiller.json
index 57a50baea..5dafcda94 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest570Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest570BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest570" : {
+    "randomStatetest570BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest590Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest590BCFiller.json
index 351101073..4a52fb215 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest590Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest590BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest590" : {
+    "randomStatetest590BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest591Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest591BCFiller.json
index 01ca05d9d..29878cc63 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest591Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest591BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest591" : {
+    "randomStatetest591BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest593Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest593BCFiller.json
index c285e5bba..03e3f510a 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest593Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest593BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest593" : {
+    "randomStatetest593BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest595Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest595BCFiller.json
index eafc776d8..ed6783812 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest595Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest595BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest595" : {
+    "randomStatetest595BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest598Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest598BCFiller.json
index 1ffd07e73..dbec56ace 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest598Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest598BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest598" : {
+    "randomStatetest598BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest606Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest606BCFiller.json
index 2006c1017..d350ff965 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest606Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest606BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest606" : {
+    "randomStatetest606BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest613Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest613BCFiller.json
index 0256d4390..849e73c62 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest613Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest613BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest613" : {
+    "randomStatetest613BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest614Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest614BCFiller.json
index b811951b5..1e2666cf2 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest614Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest614BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest614" : {
+    "randomStatetest614BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest617Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest617BCFiller.json
index 406f849eb..46be1a454 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest617Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest617BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest617" : {
+    "randomStatetest617BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest61Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest61BCFiller.json
index dbc6f2a61..29c3edfe6 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest61Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest61BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest61" : {
+    "randomStatetest61BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest622Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest622BCFiller.json
index 312c84e0b..052d0560d 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest622Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest622BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest622" : {
+    "randomStatetest622BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest623Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest623BCFiller.json
index 7ccbf65cf..9b06a70b1 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest623Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest623BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest623" : {
+    "randomStatetest623BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest631Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest631BCFiller.json
index 46e3e9230..cfe083852 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest631Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest631BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest631" : {
+    "randomStatetest631BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest70Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest634BCFiller.json
index 63c896655..cb16c1af4 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest70Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest634BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest70" : {
+    "randomStatetest634BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest65Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest65BCFiller.json
index d414abe21..9947ee93a 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest65Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest65BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest65" : {
+    "randomStatetest65BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest68Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest68BCFiller.json
index acd04abc8..0bbf150fc 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest68Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest68BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest68" : {
+    "randomStatetest68BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest634Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest70BCFiller.json
index d678fbb31..29734aba9 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest634Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest70BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest634" : {
+    "randomStatetest70BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest394Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest71BCFiller.json
index 0fc6a501d..e6ec40d20 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest394Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest71BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest394" : {
+    "randomStatetest71BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest76Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest76BCFiller.json
index b4a7f4053..001cf7027 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest76Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest76BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest76" : {
+    "randomStatetest76BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest79Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest79BCFiller.json
index a5085c09b..c6c4feb51 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest79Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest79BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest79" : {
+    "randomStatetest79BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest86Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest86BCFiller.json
index 929723d4a..d8f84b238 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest86Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest86BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest86" : {
+    "randomStatetest86BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest8Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest8BCFiller.json
index bcfff5f49..760cbf8f9 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest8Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest8BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest8" : {
+    "randomStatetest8BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest91Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest91BCFiller.json
index a4975a398..afb9edab4 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest91Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest91BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest91" : {
+    "randomStatetest91BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest93Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest93BCFiller.json
index ec3209bdb..cf6768450 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest93Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest93BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest93" : {
+    "randomStatetest93BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest99Filler.json b/src/GeneralStateTestsFiller/stRandom/randomStatetest99BCFiller.json
index 98730a8e7..bc9d1a89a 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest99Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom/randomStatetest99BCFiller.json
@@ -1,5 +1,5 @@
 {
-    "randomStatetest99" : {
+    "randomStatetest99BC" : {
         "env" : {
             "currentCoinbase" : "945304eb96065b2a98b57a48a06ae28d285a71b5",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stSpecialTest/BadStateRootTxFiller.json b/src/GeneralStateTestsFiller/stSpecialTest/BadStateRootTxBCFiller.json
index c0f82876b..b60b53d3e 100644
--- a/src/GeneralStateTestsFiller/stSpecialTest/BadStateRootTxFiller.json
+++ b/src/GeneralStateTestsFiller/stSpecialTest/BadStateRootTxBCFiller.json
@@ -1,5 +1,5 @@
 {
-    "BadStateRootTx" : {
+    "BadStateRootTxBC" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
@@ -11,13 +11,23 @@
         "expect" : [
             {
                 "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
-                "network" : ["ALL"],
+                "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
                 "result" : {
                     "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                         "balance" : "1976363",
 			"nonce" : "1"
                     }
                 }
+            },
+	    {
+                "indexes" : { "data" : -1, "gas" : -1, "value" : -1 },
+                "network" : ["Metropolis"],
+                "result" : {
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "1975583",
+			"nonce" : "1"
+                    }
+                }
             }
         ],
         "pre" : {