Merge pull request #201 from ethereum/fix-names

Fix names of test cases in GeneralStateTests to match the file names

82 files changed, 147 insertions, 147 deletions

diff --git a/src/GeneralStateTestsFiller/stMemoryTest/calldatacopy_dejavu2Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/calldatacopy_dejavu2Filler.json
index 1f82713bf..3796aefa8 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/calldatacopy_dejavu2Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/calldatacopy_dejavu2Filler.json
@@ -1,5 +1,5 @@
 {
-    "calldatacopy_dejavu2 " : {
+    "calldatacopy_dejavu2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -106,4 +106,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/calldatacopy_dejavuFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/calldatacopy_dejavuFiller.json
index e2b750212..26d519519 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/calldatacopy_dejavuFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/calldatacopy_dejavuFiller.json
@@ -1,5 +1,5 @@
 {
-    "calldatacopy_dejavu " : {
+    "calldatacopy_dejavu" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -104,4 +104,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/codecopy_dejavu2Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/codecopy_dejavu2Filler.json
index b2199ab54..249f87dc2 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/codecopy_dejavu2Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/codecopy_dejavu2Filler.json
@@ -1,5 +1,5 @@
 {
-    "codecopy_dejavu2 " : {
+    "codecopy_dejavu2" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -104,4 +104,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/codecopy_dejavuFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/codecopy_dejavuFiller.json
index e1d238411..e0efe8dc4 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/codecopy_dejavuFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/codecopy_dejavuFiller.json
@@ -1,5 +1,5 @@
 {
-    "codecopy_dejavu " : {
+    "codecopy_dejavu" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -104,4 +104,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/extcodecopy_dejavuFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/extcodecopy_dejavuFiller.json
index b404226fd..4dbb62311 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/extcodecopy_dejavuFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/extcodecopy_dejavuFiller.json
@@ -1,5 +1,5 @@
 {
-    "extcodecopy_dejavu " : {
+    "extcodecopy_dejavu" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -104,4 +104,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/log1_dejavuFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/log1_dejavuFiller.json
index 0984d539b..f48833a99 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/log1_dejavuFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/log1_dejavuFiller.json
@@ -1,5 +1,5 @@
 {
-    "log1_dejavu " : {
+    "log1_dejavu" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -104,4 +104,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/log2_dejavuFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/log2_dejavuFiller.json
index 0df2b407b..6f2af846b 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/log2_dejavuFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/log2_dejavuFiller.json
@@ -1,5 +1,5 @@
 {
-    "log2_dejavu " : {
+    "log2_dejavu" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -104,4 +104,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/log3_dejavuFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/log3_dejavuFiller.json
index 9d7ede3cf..24d7a71e0 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/log3_dejavuFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/log3_dejavuFiller.json
@@ -1,5 +1,5 @@
 {
-    "log3_dejavu " : {
+    "log3_dejavu" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -104,4 +104,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/log4_dejavuFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/log4_dejavuFiller.json
index 487af298d..1ff339155 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/log4_dejavuFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/log4_dejavuFiller.json
@@ -1,5 +1,5 @@
 {
-    "log4_dejavu " : {
+    "log4_dejavu" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -104,4 +104,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem0b_singleByteFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mem0b_singleByteFiller.json
index baabf229a..319aed3b2 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem0b_singleByteFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem0b_singleByteFiller.json
@@ -1,5 +1,5 @@
 {
-    "mem0b_singleByte " : {
+    "mem0b_singleByte" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -106,4 +106,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem31b_singleByteFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mem31b_singleByteFiller.json
index 3d2d3f4e0..0529698ab 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem31b_singleByteFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem31b_singleByteFiller.json
@@ -1,5 +1,5 @@
 {
-    "mem31b_singleByte " : {
+    "mem31b_singleByte" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -106,4 +106,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32b_singleByteFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32b_singleByteFiller.json
index 932c13305..2c4f949c8 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32b_singleByteFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32b_singleByteFiller.json
@@ -1,5 +1,5 @@
 {
-    "mem32b_singleByte " : {
+    "mem32b_singleByte" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -106,4 +106,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+1Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+1Filler.json
index 28e603515..5a7372c9c 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+1Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+1Filler.json
@@ -1,5 +1,5 @@
 {
-    "mem32kb+1 " : {
+    "mem32kb+1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -108,4 +108,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+31Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+31Filler.json
index fc46a7f98..84a41582b 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+31Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+31Filler.json
@@ -1,5 +1,5 @@
 {
-    "mem32kb+31 " : {
+    "mem32kb+31" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -108,4 +108,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+32Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+32Filler.json
index d0e09afdc..298d7b55c 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+32Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+32Filler.json
@@ -1,5 +1,5 @@
 {
-    "mem32kb+32 " : {
+    "mem32kb+32" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -108,4 +108,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+33Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+33Filler.json
index 9488c8aec..d929cf594 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+33Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb+33Filler.json
@@ -1,5 +1,5 @@
 {
-    "mem32kb+33 " : {
+    "mem32kb+33" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -108,4 +108,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-1Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-1Filler.json
index e8d6dc90a..295802e25 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-1Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-1Filler.json
@@ -1,5 +1,5 @@
 {
-    "mem32kb-1 " : {
+    "mem32kb-1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -108,4 +108,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-31Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-31Filler.json
index 43bed08a6..0164a3cff 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-31Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-31Filler.json
@@ -1,5 +1,5 @@
 {
-    "mem32kb-31 " : {
+    "mem32kb-31" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -108,4 +108,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-32Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-32Filler.json
index da1f6f22c..5bb4fbfce 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-32Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-32Filler.json
@@ -1,5 +1,5 @@
 {
-    "mem32kb-32 " : {
+    "mem32kb-32" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -108,4 +108,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-33Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-33Filler.json
index 6f59b8121..39b57709b 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-33Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb-33Filler.json
@@ -1,5 +1,5 @@
 {
-    "mem32kb-33 " : {
+    "mem32kb-33" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -108,4 +108,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kbFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kbFiller.json
index b3d5b32ea..13ec00f35 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kbFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kbFiller.json
@@ -1,5 +1,5 @@
 {
-    "mem32kb " : {
+    "mem32kb" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -108,4 +108,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+1Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+1Filler.json
index 2570cc093..0ae8fcccb 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+1Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+1Filler.json
@@ -1,5 +1,5 @@
 {
-    "mem32kb_singleByte+1 " : {
+    "mem32kb_singleByte+1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -106,4 +106,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+31Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+31Filler.json
index 1c4e8b422..d14e623f0 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+31Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+31Filler.json
@@ -1,5 +1,5 @@
 {
-    "mem32kb_singleByte+31 " : {
+    "mem32kb_singleByte+31" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -106,4 +106,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+32Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+32Filler.json
index 2f5534508..cc630ee6d 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+32Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+32Filler.json
@@ -1,5 +1,5 @@
 {
-    "mem32kb_singleByte+32 " : {
+    "mem32kb_singleByte+32" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -106,4 +106,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+33Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+33Filler.json
index 22c36bf80..048718998 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+33Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte+33Filler.json
@@ -1,5 +1,5 @@
 {
-    "mem32kb_singleByte+33 " : {
+    "mem32kb_singleByte+33" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -106,4 +106,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-1Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-1Filler.json
index be7bfbf45..0584c2ea0 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-1Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-1Filler.json
@@ -1,5 +1,5 @@
 {
-    "mem32kb_singleByte-1 " : {
+    "mem32kb_singleByte-1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -106,4 +106,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-31Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-31Filler.json
index a41c9899e..1c61257e2 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-31Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-31Filler.json
@@ -1,5 +1,5 @@
 {
-    "mem32kb_singleByte-31 " : {
+    "mem32kb_singleByte-31" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -106,4 +106,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-32Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-32Filler.json
index 13d403f38..227bc850d 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-32Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-32Filler.json
@@ -1,5 +1,5 @@
 {
-    "mem32kb_singleByte-32 " : {
+    "mem32kb_singleByte-32" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -106,4 +106,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-33Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-33Filler.json
index 835c9ba70..ba17d6fd1 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-33Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByte-33Filler.json
@@ -1,5 +1,5 @@
 {
-    "mem32kb_singleByte-33 " : {
+    "mem32kb_singleByte-33" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -106,4 +106,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByteFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByteFiller.json
index e85cb8a3a..e58a05cca 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByteFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem32kb_singleByteFiller.json
@@ -1,5 +1,5 @@
 {
-    "mem32kb_singleByte " : {
+    "mem32kb_singleByte" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -106,4 +106,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem33b_singleByteFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mem33b_singleByteFiller.json
index 2ce110392..7de6b7581 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem33b_singleByteFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem33b_singleByteFiller.json
@@ -1,5 +1,5 @@
 {
-    "mem33b_singleByte " : {
+    "mem33b_singleByte" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -106,4 +106,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+1Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+1Filler.json
index 8b3d71564..03fcf8315 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+1Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+1Filler.json
@@ -1,5 +1,5 @@
 {
-    "mem64kb+1 " : {
+    "mem64kb+1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -108,4 +108,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+31Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+31Filler.json
index 6807bca5a..f26d85793 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+31Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+31Filler.json
@@ -1,5 +1,5 @@
 {
-    "mem64kb+31 " : {
+    "mem64kb+31" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -108,4 +108,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+32Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+32Filler.json
index 7acf98554..42dfc5f49 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+32Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+32Filler.json
@@ -1,5 +1,5 @@
 {
-    "mem64kb+32 " : {
+    "mem64kb+32" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -108,4 +108,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+33Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+33Filler.json
index e5c8b8de4..0bffcf794 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+33Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb+33Filler.json
@@ -1,5 +1,5 @@
 {
-    "mem64kb+33 " : {
+    "mem64kb+33" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -108,4 +108,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-1Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-1Filler.json
index 8a9b354e7..912d3ada4 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-1Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-1Filler.json
@@ -1,5 +1,5 @@
 {
-    "mem64kb-1 " : {
+    "mem64kb-1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -108,4 +108,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-31Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-31Filler.json
index 5734d3246..2a2f1c4b1 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-31Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-31Filler.json
@@ -1,5 +1,5 @@
 {
-    "mem64kb-31 " : {
+    "mem64kb-31" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -108,4 +108,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-32Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-32Filler.json
index 42b085e4f..d8adf1b81 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-32Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-32Filler.json
@@ -1,5 +1,5 @@
 {
-    "mem64kb-32 " : {
+    "mem64kb-32" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -108,4 +108,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-33Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-33Filler.json
index 07f657372..e89026ee1 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-33Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb-33Filler.json
@@ -1,5 +1,5 @@
 {
-    "mem64kb-33 " : {
+    "mem64kb-33" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -108,4 +108,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kbFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kbFiller.json
index d22768990..2a2236b27 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kbFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kbFiller.json
@@ -1,5 +1,5 @@
 {
-    "mem64kb " : {
+    "mem64kb" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -108,4 +108,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+1Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+1Filler.json
index af94f17a4..64e9f3b0f 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+1Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+1Filler.json
@@ -1,5 +1,5 @@
 {
-    "mem64kb_singleByte+1 " : {
+    "mem64kb_singleByte+1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -106,4 +106,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+31Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+31Filler.json
index 165222eb2..a2fe6e4ee 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+31Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+31Filler.json
@@ -1,5 +1,5 @@
 {
-    "mem64kb_singleByte+31 " : {
+    "mem64kb_singleByte+31" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -106,4 +106,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+32Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+32Filler.json
index 246db89e3..25fa927ad 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+32Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+32Filler.json
@@ -1,5 +1,5 @@
 {
-    "mem64kb_singleByte+32 " : {
+    "mem64kb_singleByte+32" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -106,4 +106,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+33Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+33Filler.json
index c5868e2d0..4a78c6f51 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+33Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte+33Filler.json
@@ -1,5 +1,5 @@
 {
-    "mem64kb_singleByte+33 " : {
+    "mem64kb_singleByte+33" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -106,4 +106,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-1Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-1Filler.json
index 8919f4eda..bf0ad5144 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-1Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-1Filler.json
@@ -1,5 +1,5 @@
 {
-    "mem64kb_singleByte-1 " : {
+    "mem64kb_singleByte-1" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -106,4 +106,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-31Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-31Filler.json
index 9961cc509..7ab559d46 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-31Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-31Filler.json
@@ -1,5 +1,5 @@
 {
-    "mem64kb_singleByte-31 " : {
+    "mem64kb_singleByte-31" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -106,4 +106,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-32Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-32Filler.json
index c5f8b5b30..c4ca259cd 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-32Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-32Filler.json
@@ -1,5 +1,5 @@
 {
-    "mem64kb_singleByte-32 " : {
+    "mem64kb_singleByte-32" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -106,4 +106,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-33Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-33Filler.json
index 6820d5574..ace2c1178 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-33Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByte-33Filler.json
@@ -1,5 +1,5 @@
 {
-    "mem64kb_singleByte-33 " : {
+    "mem64kb_singleByte-33" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -106,4 +106,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByteFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByteFiller.json
index ade129f55..32e8b3a80 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByteFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mem64kb_singleByteFiller.json
@@ -1,5 +1,5 @@
 {
-    "mem64kb_singleByte " : {
+    "mem64kb_singleByte" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -106,4 +106,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/memReturnFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/memReturnFiller.json
index 5b15b0622..a270cd9f7 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/memReturnFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/memReturnFiller.json
@@ -1,5 +1,5 @@
 {
-    "memReturn " : {
+    "memReturn" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -104,4 +104,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mload16bitBoundFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mload16bitBoundFiller.json
index c47f55552..c11aadbbb 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mload16bitBoundFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mload16bitBoundFiller.json
@@ -1,5 +1,5 @@
 {
-    "mload16bitBound " : {
+    "mload16bitBound" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -104,4 +104,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mload8bitBoundFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mload8bitBoundFiller.json
index a9ec1f304..087b135cb 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mload8bitBoundFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mload8bitBoundFiller.json
@@ -1,5 +1,5 @@
 {
-    "mload8bitBound " : {
+    "mload8bitBound" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -104,4 +104,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mload_dejavuFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mload_dejavuFiller.json
index 4588ebbe9..a4efda44b 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mload_dejavuFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mload_dejavuFiller.json
@@ -1,5 +1,5 @@
 {
-    "mload_dejavu " : {
+    "mload_dejavu" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -104,4 +104,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mstore_dejavuFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mstore_dejavuFiller.json
index e250ee91e..a447a7554 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mstore_dejavuFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mstore_dejavuFiller.json
@@ -1,5 +1,5 @@
 {
-    "mstore_dejavu " : {
+    "mstore_dejavu" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -104,4 +104,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/mstroe8_dejavuFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/mstroe8_dejavuFiller.json
index c7f81e79e..192d5d87f 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/mstroe8_dejavuFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/mstroe8_dejavuFiller.json
@@ -1,5 +1,5 @@
 {
-    "mstroe8_dejavu " : {
+    "mstroe8_dejavu" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -104,4 +104,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/sha3_dejavuFiller.json b/src/GeneralStateTestsFiller/stMemoryTest/sha3_dejavuFiller.json
index e2fb252fe..d6eeec3bf 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/sha3_dejavuFiller.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/sha3_dejavuFiller.json
@@ -1,5 +1,5 @@
 {
-    "sha3_dejavu " : {
+    "sha3_dejavu" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -104,4 +104,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitGas_1023Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitGas_1023Filler.json
index e569370ea..d02598120 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitGas_1023Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitGas_1023Filler.json
@@ -1,5 +1,5 @@
 {
-    "stackLimitGas_1023 " : {
+    "stackLimitGas_1023" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -104,4 +104,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitGas_1024Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitGas_1024Filler.json
index ceecf6962..a8c826ba0 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitGas_1024Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitGas_1024Filler.json
@@ -1,5 +1,5 @@
 {
-    "stackLimitGas_1024 " : {
+    "stackLimitGas_1024" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -104,4 +104,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitGas_1025Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitGas_1025Filler.json
index 0964150b2..95fe6963b 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitGas_1025Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitGas_1025Filler.json
@@ -1,5 +1,5 @@
 {
-    "stackLimitGas_1025 " : {
+    "stackLimitGas_1025" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -104,4 +104,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush31_1023Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush31_1023Filler.json
index 943bc30d5..c957eda94 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush31_1023Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush31_1023Filler.json
@@ -1,5 +1,5 @@
 {
-    "stackLimitPush31_1023 " : {
+    "stackLimitPush31_1023" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -104,4 +104,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush31_1024Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush31_1024Filler.json
index e6a819b8d..858b6e232 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush31_1024Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush31_1024Filler.json
@@ -1,5 +1,5 @@
 {
-    "stackLimitPush31_1024 " : {
+    "stackLimitPush31_1024" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -104,4 +104,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush31_1025Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush31_1025Filler.json
index 90875b6a4..085437e26 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush31_1025Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush31_1025Filler.json
@@ -1,5 +1,5 @@
 {
-    "stackLimitPush31_1025 " : {
+    "stackLimitPush31_1025" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -104,4 +104,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush32_1023Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush32_1023Filler.json
index 3a7cbf0ba..890689c7d 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush32_1023Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush32_1023Filler.json
@@ -1,5 +1,5 @@
 {
-    "stackLimitPush32_1023 " : {
+    "stackLimitPush32_1023" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -104,4 +104,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush32_1024Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush32_1024Filler.json
index 854c4f220..2c233cfa1 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush32_1024Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush32_1024Filler.json
@@ -1,5 +1,5 @@
 {
-    "stackLimitPush32_1024 " : {
+    "stackLimitPush32_1024" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -104,4 +104,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush32_1025Filler.json b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush32_1025Filler.json
index f04b25445..8f6de5fa0 100644
--- a/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush32_1025Filler.json
+++ b/src/GeneralStateTestsFiller/stMemoryTest/stackLimitPush32_1025Filler.json
@@ -1,5 +1,5 @@
 {
-    "stackLimitPush32_1025 " : {
+    "stackLimitPush32_1025" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
@@ -104,4 +104,4 @@
             ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLFiller.json
index 87679183a..e4142181e 100644
--- a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLFiller.json
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_CALLFiller.json
@@ -1,5 +1,5 @@
 {
-    "CALL_OneVCallSuicide" : {
+    "NonZeroValue_CALL" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDEFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDEFiller.json
index a32edcdc4..27d38766c 100644
--- a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDEFiller.json
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDEFiller.json
@@ -1,5 +1,5 @@
 {
-    "NonZeroValue_SELFDESTRUCT" : {
+    "NonZeroValue_SUICIDE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmptyFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmptyFiller.json
index 72be2bcf3..53d8b8609 100644
--- a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmptyFiller.json
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToEmptyFiller.json
@@ -1,5 +1,5 @@
 {
-    "NonZeroValue_SELFDESTRUCT_ToEmpty" : {
+    "NonZeroValue_SUICIDE_ToEmpty" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalanceFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalanceFiller.json
index e37231aaf..ae29b022e 100644
--- a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalanceFiller.json
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToNonNonZeroBalanceFiller.json
@@ -1,5 +1,5 @@
 {
-    "NonZeroValue_SELFDESTRUCT_ToNonNonZeroBalance" : {
+    "NonZeroValue_SUICIDE_ToNonNonZeroBalance" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
diff --git a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKeyFiller.json b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKeyFiller.json
index 8c0b3d678..812115131 100644
--- a/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKeyFiller.json
+++ b/src/GeneralStateTestsFiller/stNonZeroCallsTest/NonZeroValue_SUICIDE_ToOneStorageKeyFiller.json
@@ -1,5 +1,5 @@
 {
-    "NonZeroValue_SELFDESTRUCT_ToOneStorageKey" : {
+    "NonZeroValue_SUICIDE_ToOneStorageKey" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_ZeroValue_SUICIDE_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stStaticCall/static_ZeroValue_SUICIDE_OOGRevertFiller.json
index 7542568e9..e971c8ada 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_ZeroValue_SUICIDE_OOGRevertFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_ZeroValue_SUICIDE_OOGRevertFiller.json
@@ -1,5 +1,5 @@
 {
-    "static_ZeroValue_SELFDESTRUCT_OOGRevert" : {
+    "static_ZeroValue_SUICIDE_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
diff --git a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_1102Filler.json b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_1102Filler.json
index 4ac901865..7a06c60b1 100644
--- a/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_1102Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCall/static_callcodecallcodecall_1102Filler.json
@@ -1,5 +1,5 @@
 {
-    "static_callcodecallcodecall_110_2" : {
+    "static_callcodecallcodecall_1102" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stStaticCallNoStateChange/static_ZeroValue_SUICIDE_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stStaticCallNoStateChange/static_ZeroValue_SUICIDE_OOGRevertFiller.json
index d66d57ee1..46768f8a4 100644
--- a/src/GeneralStateTestsFiller/stStaticCallNoStateChange/static_ZeroValue_SUICIDE_OOGRevertFiller.json
+++ b/src/GeneralStateTestsFiller/stStaticCallNoStateChange/static_ZeroValue_SUICIDE_OOGRevertFiller.json
@@ -1,5 +1,5 @@
 {
-    "static_ZeroValue_SELFDESTRUCT_OOGRevert" : {
+    "static_ZeroValue_SUICIDE_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
diff --git a/src/GeneralStateTestsFiller/stStaticCallNoStateChange/static_callcodecallcodecall_1102Filler.json b/src/GeneralStateTestsFiller/stStaticCallNoStateChange/static_callcodecallcodecall_1102Filler.json
index 1399d3285..5e28c629a 100644
--- a/src/GeneralStateTestsFiller/stStaticCallNoStateChange/static_callcodecallcodecall_1102Filler.json
+++ b/src/GeneralStateTestsFiller/stStaticCallNoStateChange/static_callcodecallcodecall_1102Filler.json
@@ -1,5 +1,5 @@
 {
-    "static_callcodecallcodecall_110_2" : {
+    "static_callcodecallcodecall_1102" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevertFiller.json
index 4967e8386..338af7ef9 100644
--- a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevertFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_OOGRevertFiller.json
@@ -1,5 +1,5 @@
 {
-    "ZeroValue_SELFDESTRUCT_OOGRevert" : {
+    "ZeroValue_SUICIDE_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
diff --git a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevertFiller.json
index 55d92b0f6..ccaa87500 100644
--- a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevertFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToEmpty_OOGRevertFiller.json
@@ -1,5 +1,5 @@
 {
-    "ZeroValue_SELFDESTRUCT_ToEmpty_OOGRevert" : {
+    "ZeroValue_SUICIDE_ToEmpty_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
diff --git a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevertFiller.json
index 773d18fc4..ceb37203e 100644
--- a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevertFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevertFiller.json
@@ -1,5 +1,5 @@
 {
-    "ZeroValue_SELFDESTRUCT_ToNonZeroBalance_OOGRevert" : {
+    "ZeroValue_SUICIDE_ToNonZeroBalance_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
diff --git a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevertFiller.json b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevertFiller.json
index c2938a067..bb2661948 100644
--- a/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevertFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroCallsRevert/ZeroValue_SUICIDE_ToOneStorageKey_OOGRevertFiller.json
@@ -1,5 +1,5 @@
 {
-    "ZeroValue_SELFDESTRUCT_ToOneStorageKey_OOGRevert" : {
+    "ZeroValue_SUICIDE_ToOneStorageKey_OOGRevert" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDEFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDEFiller.json
index 16ebbf32e..149576974 100644
--- a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDEFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDEFiller.json
@@ -1,5 +1,5 @@
 {
-    "ZeroValue_SELFDESTRUCT" : {
+    "ZeroValue_SUICIDE" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToEmptyFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToEmptyFiller.json
index b093b921c..cd5d5d556 100644
--- a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToEmptyFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToEmptyFiller.json
@@ -1,5 +1,5 @@
 {
-    "ZeroValue_SELFDESTRUCT_ToEmpty" : {
+    "ZeroValue_SUICIDE_ToEmpty" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToNonZeroBalanceFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToNonZeroBalanceFiller.json
index fde15c8d5..58e0ab033 100644
--- a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToNonZeroBalanceFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToNonZeroBalanceFiller.json
@@ -1,5 +1,5 @@
 {
-    "ZeroValue_SELFDESTRUCT_ToNonZeroBalance" : {
+    "ZeroValue_SUICIDE_ToNonZeroBalance" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToOneStorageKeyFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToOneStorageKeyFiller.json
index 11b1aeed7..e69a4b795 100644
--- a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToOneStorageKeyFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_SUICIDE_ToOneStorageKeyFiller.json
@@ -1,5 +1,5 @@
 {
-    "ZeroValue_SELFDESTRUCT_ToOneStorageKey" : {
+    "ZeroValue_SUICIDE_ToOneStorageKey" : {
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x020000",