remove old transaction tests

75 files changed, 0 insertions, 1379 deletions

diff --git a/src/TransactionTestsFiller/ttEip158/AddressLessThan20Filler.json b/src/TransactionTestsFiller/ttEip158/AddressLessThan20Filler.json
deleted file mode 100644
index 3046ca257..000000000
--- a/src/TransactionTestsFiller/ttEip158/AddressLessThan20Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "AddressLessThan20" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "0b9331677e6ebf",
-            "value" : "10",
-            "v" : "28",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/AddressLessThan20Prefixed0Filler.json b/src/TransactionTestsFiller/ttEip158/AddressLessThan20Prefixed0Filler.json
deleted file mode 100644
index f4f999bf3..000000000
--- a/src/TransactionTestsFiller/ttEip158/AddressLessThan20Prefixed0Filler.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "AddressLessThan20Prefixed0" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-	"sender" : "aeed6ced7a2af49a8ff0dca6a0811e40462a6d4d",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "0x000000000000000000000000000b9331677e6ebf",
-            "value" : "10",
-            "v" : "28",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
-            "s" : "0x2887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/AddressMoreThan20Filler.json b/src/TransactionTestsFiller/ttEip158/AddressMoreThan20Filler.json
deleted file mode 100644
index 25744b7a5..000000000
--- a/src/TransactionTestsFiller/ttEip158/AddressMoreThan20Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "AddressMoreThan20" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b1c",
-            "value" : "10",
-            "v" : "28",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/AddressMoreThan20PrefixedBy0Filler.json b/src/TransactionTestsFiller/ttEip158/AddressMoreThan20PrefixedBy0Filler.json
deleted file mode 100644
index dc78595da..000000000
--- a/src/TransactionTestsFiller/ttEip158/AddressMoreThan20PrefixedBy0Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "AddressMoreThan20PrefixedBy0" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "0x12",
-            "gasLimit" : "21000",
-            "gasPrice" : "123",
-            "nonce" : "54",
-            "to" : "0x0000000000000000095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "27",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/DataTestEnoughGASFiller.json b/src/TransactionTestsFiller/ttEip158/DataTestEnoughGASFiller.json
deleted file mode 100644
index d3fb5bd79..000000000
--- a/src/TransactionTestsFiller/ttEip158/DataTestEnoughGASFiller.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "DataTestEnoughGAS" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-	"sender" : "1e42dc399dc122b1172fa3c3d9a9a0adabf7d026",
-        "transaction" :
-        {
-            "data" : "0x0358ac39584bc98a7c979f984b03",
-            "gasLimit" : "23000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "10",
-            "v" : "27",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "secretkey 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "s" : "0x1fffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/DataTestFirstZeroBytesFiller.json b/src/TransactionTestsFiller/ttEip158/DataTestFirstZeroBytesFiller.json
deleted file mode 100644
index 22255c87c..000000000
--- a/src/TransactionTestsFiller/ttEip158/DataTestFirstZeroBytesFiller.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "DataTestFirstZeroBytes" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-	"sender" : "67719a47cf3e3fe77b89c994d85395ad0f899d86",
-        "transaction" :
-        {
-            "data" : "0x0000000000000000000000000001000000000000000000000000000000",
-            "gasLimit" : "25000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "10",
-            "v" : "27",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "secretkey 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "s" : "0x1fffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/DataTestLastZeroBytesFiller.json b/src/TransactionTestsFiller/ttEip158/DataTestLastZeroBytesFiller.json
deleted file mode 100644
index ecd05fc56..000000000
--- a/src/TransactionTestsFiller/ttEip158/DataTestLastZeroBytesFiller.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-     "DataTestLastZeroBytes" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-	"sender" : "93641cf56c3cb70af282fb4c4eece66c425b8719",
-        "transaction" :
-        {
-            "data" : "0x0010000000000000000000000000000000000000000000000000000000",
-            "gasLimit" : "25000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "10",
-            "v" : "27",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "secretkey 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "s" : "0x1fffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/DataTestNotEnoughGASFiller.json b/src/TransactionTestsFiller/ttEip158/DataTestNotEnoughGASFiller.json
deleted file mode 100644
index f0b663006..000000000
--- a/src/TransactionTestsFiller/ttEip158/DataTestNotEnoughGASFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "DataTestNotEnoughGAS" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "0x0358ac39584bc98a7c979f984b03",
-            "gasLimit" : "21020",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "10",
-            "v" : "27",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/DataTestZeroBytesFiller.json b/src/TransactionTestsFiller/ttEip158/DataTestZeroBytesFiller.json
deleted file mode 100644
index 82d320e0b..000000000
--- a/src/TransactionTestsFiller/ttEip158/DataTestZeroBytesFiller.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "DataTestZeroBytes" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-	"sender" : "61adaba383a740078e3efbddf082be05534e5484",
-        "transaction" :
-        {
-            "data" : "0x0000000000000000000000000000000000000000000000000000000000",
-            "gasLimit" : "25000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "10",
-            "v" : "27",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "secretkey 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "s" : "0x1fffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/EmptyTransactionFiller.json b/src/TransactionTestsFiller/ttEip158/EmptyTransactionFiller.json
deleted file mode 100644
index 0a1d5f938..000000000
--- a/src/TransactionTestsFiller/ttEip158/EmptyTransactionFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "EmptyTransaction" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "0",
-            "gasPrice" : "0",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "0",
-            "v" : "27",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/NotEnoughGasLimitFiller.json b/src/TransactionTestsFiller/ttEip158/NotEnoughGasLimitFiller.json
deleted file mode 100644
index 47c840fa8..000000000
--- a/src/TransactionTestsFiller/ttEip158/NotEnoughGasLimitFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "NotEnoughGasLimit" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "0x",
-            "gasLimit" : "20000",
-            "gasPrice" : "1",
-            "nonce" : "3",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : "10",
-            "v" : "28",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/RSsecp256k1Filler.json b/src/TransactionTestsFiller/ttEip158/RSsecp256k1Filler.json
deleted file mode 100644
index 3dd7bc2d6..000000000
--- a/src/TransactionTestsFiller/ttEip158/RSsecp256k1Filler.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "RSsecp256k1" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-	"transaction" : {
-            "data" : "0x",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "3",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : "10",
-            "v" : "28",
-            "r" : "0xfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141",
-            "s" : "0xfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/RightVRSTestFiller.json b/src/TransactionTestsFiller/ttEip158/RightVRSTestFiller.json
deleted file mode 100644
index 753f14367..000000000
--- a/src/TransactionTestsFiller/ttEip158/RightVRSTestFiller.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "RightVRSTest" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-	"sender" : "58d79230fc81a042315da7d243272798e27cb40c",
-        "transaction" :
-        {
-            "data" : "0x",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "3",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : "10",
-            "v" : "28",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/SenderTestFiller.json b/src/TransactionTestsFiller/ttEip158/SenderTestFiller.json
deleted file mode 100644
index ca3111cb3..000000000
--- a/src/TransactionTestsFiller/ttEip158/SenderTestFiller.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "SenderTest" : {
-        "senderExpect" : "sender 963f4a0d8a11b758de8d5b99ab4ac898d6438ea6",
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "10",
-            "v" : "27",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "secretkey 45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
-            "s" : "0x1fffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/TransactionWithGasLimitOverflow2Filler.json b/src/TransactionTestsFiller/ttEip158/TransactionWithGasLimitOverflow2Filler.json
deleted file mode 100644
index f729cecb0..000000000
--- a/src/TransactionTestsFiller/ttEip158/TransactionWithGasLimitOverflow2Filler.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "TransactionWithGasLimitOverflow2" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-	"sender" : "218431a9ef4dc9b947c0a76185e1e4823b254ac5",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "2^63",
-            "gasLimit" : "9223372036854775808",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "27",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/TransactionWithGasLimitOverflow63Filler.json b/src/TransactionTestsFiller/ttEip158/TransactionWithGasLimitOverflow63Filler.json
deleted file mode 100644
index f631902fc..000000000
--- a/src/TransactionTestsFiller/ttEip158/TransactionWithGasLimitOverflow63Filler.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "TransactionWithGasLimitOverflow63" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-	"sender" : "218431a9ef4dc9b947c0a76185e1e4823b254ac5",
-	"transaction" :
-	{
-		"data" : "",
-		"gasLimit" : "9223372036854775808",
-		"gasPrice" : "1",
-		"nonce" : "0",
-		"to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-		"value" : "11",
-		"v" : "27",
-		"r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-		"s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-	}
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/TransactionWithGasLimitOverflow63_1Filler.json b/src/TransactionTestsFiller/ttEip158/TransactionWithGasLimitOverflow63_1Filler.json
deleted file mode 100644
index 3e26218a7..000000000
--- a/src/TransactionTestsFiller/ttEip158/TransactionWithGasLimitOverflow63_1Filler.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "TransactionWithGasLimitOverflow63_1" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-	"sender" : "1bbb6dd3cf238e9ca95be4547d749527616b7c87",
-	"transaction" :
-	{
-		"data" : "",
-		"gasLimit" : "9223372036854775809",
-		"gasPrice" : "1",
-		"nonce" : "0",
-		"to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-		"value" : "11",
-		"v" : "27",
-		"r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-		"s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-	}
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/TransactionWithGasLimitOverflowFiller.json b/src/TransactionTestsFiller/ttEip158/TransactionWithGasLimitOverflowFiller.json
deleted file mode 100644
index f1b2d55a0..000000000
--- a/src/TransactionTestsFiller/ttEip158/TransactionWithGasLimitOverflowFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithGasLimitOverflow" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "115792089237316195423570985008687907853269984665640564039457584007913129639936",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "27",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/TransactionWithGasLimitxPriceOverflow2Filler.json b/src/TransactionTestsFiller/ttEip158/TransactionWithGasLimitxPriceOverflow2Filler.json
deleted file mode 100644
index 84352f2bb..000000000
--- a/src/TransactionTestsFiller/ttEip158/TransactionWithGasLimitxPriceOverflow2Filler.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "TransactionWithGasLimitxPriceOverflow2" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-	"sender" : "9f1716abe69ec0f5716db2a3188656b0924ab839",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "10000000",
-            "gasPrice" : "16769767339735900",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "0",
-            "v" : "27",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/TransactionWithGasLimitxPriceOverflowFiller.json b/src/TransactionTestsFiller/ttEip158/TransactionWithGasLimitxPriceOverflowFiller.json
deleted file mode 100644
index 55cc0165f..000000000
--- a/src/TransactionTestsFiller/ttEip158/TransactionWithGasLimitxPriceOverflowFiller.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "TransactionWithGasLimitxPriceOverflow" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-	"sender" : "23be87da91219226620903a2e4b7da694c93bcab",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
-            "gasPrice" : "100000000000000000",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "0",
-            "v" : "27",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/TransactionWithGasPriceOverflowFiller.json b/src/TransactionTestsFiller/ttEip158/TransactionWithGasPriceOverflowFiller.json
deleted file mode 100644
index 47935afc8..000000000
--- a/src/TransactionTestsFiller/ttEip158/TransactionWithGasPriceOverflowFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithGasPriceOverflow" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "115792089237316195423570985008687907853269984665640564039457584007913129639936",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "27",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/TransactionWithHighValueOverflowFiller.json b/src/TransactionTestsFiller/ttEip158/TransactionWithHighValueOverflowFiller.json
deleted file mode 100644
index 6d6195dee..000000000
--- a/src/TransactionTestsFiller/ttEip158/TransactionWithHighValueOverflowFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithHighValueOverflow" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "115792089237316195423570985008687907853269984665640564039457584007913129639936",
-            "v" : "27",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/TransactionWithHihghGasLimit63m1Filler.json b/src/TransactionTestsFiller/ttEip158/TransactionWithHihghGasLimit63m1Filler.json
deleted file mode 100644
index c334d3e17..000000000
--- a/src/TransactionTestsFiller/ttEip158/TransactionWithHihghGasLimit63m1Filler.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "TransactionWithHihghGasLimit63m1" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-	"sender" : "fc8bb7b57399d1737bdaaa3d3debaad6d2f527ef",
-        "transaction" :
-        {
-            "data" : "",
-	    "gasLimit" : "2^63 - 1",
-            "gasLimit" : "9223372036854775807",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "0",
-            "v" : "27",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/TransactionWithHihghGasPrice2Filler.json b/src/TransactionTestsFiller/ttEip158/TransactionWithHihghGasPrice2Filler.json
deleted file mode 100644
index 510b00579..000000000
--- a/src/TransactionTestsFiller/ttEip158/TransactionWithHihghGasPrice2Filler.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "TransactionWithHihghGasPrice2" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-	"sender" : "e39858136ff4636a4678f77637e1f253e789b779",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "55000",
-            "gasPrice" : "167697673397359",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "0",
-            "v" : "27",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/TransactionWithHihghGasPriceFiller.json b/src/TransactionTestsFiller/ttEip158/TransactionWithHihghGasPriceFiller.json
deleted file mode 100644
index ea8950603..000000000
--- a/src/TransactionTestsFiller/ttEip158/TransactionWithHihghGasPriceFiller.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "TransactionWithHihghGasPrice" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-	"sender" : "e2e601b6c0cc72dbc610dae99ff255fd36cb52e8",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "0",
-            "v" : "27",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/TransactionWithHihghNonce256Filler.json b/src/TransactionTestsFiller/ttEip158/TransactionWithHihghNonce256Filler.json
deleted file mode 100644
index 53f2b7704..000000000
--- a/src/TransactionTestsFiller/ttEip158/TransactionWithHihghNonce256Filler.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "TransactionWithHihghNonce256" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-	"sender" : "d4371a5ce719f358580132061172bd601bc59842",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "0",
-            "v" : "27",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0x1fffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/TransactionWithHihghNonce32Filler.json b/src/TransactionTestsFiller/ttEip158/TransactionWithHihghNonce32Filler.json
deleted file mode 100644
index a14bef5b4..000000000
--- a/src/TransactionTestsFiller/ttEip158/TransactionWithHihghNonce32Filler.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "TransactionWithHihghNonce32" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-	"sender" : "f3dac79274af6e51fbefe9d74a07bdef53d48ea1",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "4294967296",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "0",
-            "v" : "27",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0x1fffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/TransactionWithHihghValueFiller.json b/src/TransactionTestsFiller/ttEip158/TransactionWithHihghValueFiller.json
deleted file mode 100644
index a116d9d46..000000000
--- a/src/TransactionTestsFiller/ttEip158/TransactionWithHihghValueFiller.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "TransactionWithHihghValue" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-	"sender" : "8411b12666f68ef74cace3615c9d5a377729d03f",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "115792089237316195423570985008687907853269984665640564039457584007913129639935",
-            "v" : "27",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0x1fffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/TransactionWithNonceOverflowFiller.json b/src/TransactionTestsFiller/ttEip158/TransactionWithNonceOverflowFiller.json
deleted file mode 100644
index aee16973a..000000000
--- a/src/TransactionTestsFiller/ttEip158/TransactionWithNonceOverflowFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithNonceOverflow" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "115792089237316195423570985008687907853269984665640564039457584007913129639936",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "27",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/TransactionWithRSvalue0Filler.json b/src/TransactionTestsFiller/ttEip158/TransactionWithRSvalue0Filler.json
deleted file mode 100644
index 7e25b4db0..000000000
--- a/src/TransactionTestsFiller/ttEip158/TransactionWithRSvalue0Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithRSvalue0" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "27",
-            "r" : "0",
-            "s" : "0"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/TransactionWithRSvalue1Filler.json b/src/TransactionTestsFiller/ttEip158/TransactionWithRSvalue1Filler.json
deleted file mode 100644
index 347f38b80..000000000
--- a/src/TransactionTestsFiller/ttEip158/TransactionWithRSvalue1Filler.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "TransactionWithRSvalue1" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-	"sender" : "98c188f183d4e93ff2bffadd145f39b4a792ed85",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "27",
-            "r" : "1",
-            "s" : "1"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/TransactionWithRvalue0Filler.json b/src/TransactionTestsFiller/ttEip158/TransactionWithRvalue0Filler.json
deleted file mode 100644
index 5626ba10c..000000000
--- a/src/TransactionTestsFiller/ttEip158/TransactionWithRvalue0Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithRvalue0" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "27",
-            "r" : "0",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/TransactionWithRvalue1Filler.json b/src/TransactionTestsFiller/ttEip158/TransactionWithRvalue1Filler.json
deleted file mode 100644
index 083da5730..000000000
--- a/src/TransactionTestsFiller/ttEip158/TransactionWithRvalue1Filler.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "TransactionWithRvalue1" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-	"sender" : "54df0af0fd1d8ad90b5a13ff1f95463aec055bab",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "27",
-            "r" : "0x01",
-            "s" : "0x1fffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/TransactionWithRvalueHighFiller.json b/src/TransactionTestsFiller/ttEip158/TransactionWithRvalueHighFiller.json
deleted file mode 100644
index b6f91f9e3..000000000
--- a/src/TransactionTestsFiller/ttEip158/TransactionWithRvalueHighFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithRvalueHigh" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "27",
-            "r" : "0xfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364140",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/TransactionWithRvalueOverflowFiller.json b/src/TransactionTestsFiller/ttEip158/TransactionWithRvalueOverflowFiller.json
deleted file mode 100644
index 7a64dea9d..000000000
--- a/src/TransactionTestsFiller/ttEip158/TransactionWithRvalueOverflowFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithRvalueOverflow" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "27",
-            "r" : "0xfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd03641410000",
-            "s" : "0xefffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/TransactionWithRvaluePrefixed00Filler.json b/src/TransactionTestsFiller/ttEip158/TransactionWithRvaluePrefixed00Filler.json
deleted file mode 100644
index 00bafd4b9..000000000
--- a/src/TransactionTestsFiller/ttEip158/TransactionWithRvaluePrefixed00Filler.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "TransactionWithRvaluePrefixed00" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-	"sender" : "59805be0fb22cec65ee107f39f51d2a54cf8c522",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "27",
-            "r" : "0xebaaedce6af48a03bbfd25e8cd0364141",
-            "s" : "0x1fffd310ac743f371de3b9f7f9cb56c0b28ad43601b4ab949f53faa07bd2c804"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/TransactionWithRvalueTooHighFiller.json b/src/TransactionTestsFiller/ttEip158/TransactionWithRvalueTooHighFiller.json
deleted file mode 100644
index 996f4a3e1..000000000
--- a/src/TransactionTestsFiller/ttEip158/TransactionWithRvalueTooHighFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithRvalueTooHigh" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "27",
-            "r" : "0xfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/TransactionWithSvalue0Filler.json b/src/TransactionTestsFiller/ttEip158/TransactionWithSvalue0Filler.json
deleted file mode 100644
index 329607627..000000000
--- a/src/TransactionTestsFiller/ttEip158/TransactionWithSvalue0Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithSvalue0" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "27",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/TransactionWithSvalue1Filler.json b/src/TransactionTestsFiller/ttEip158/TransactionWithSvalue1Filler.json
deleted file mode 100644
index 713401edc..000000000
--- a/src/TransactionTestsFiller/ttEip158/TransactionWithSvalue1Filler.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "TransactionWithSvalue1" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-	"sender" : "e115cf6bb5656786569dd273705242ca72d84bc0",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "27",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0x01"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/TransactionWithSvalueEqual_c_secp256k1n_x05Filler.json b/src/TransactionTestsFiller/ttEip158/TransactionWithSvalueEqual_c_secp256k1n_x05Filler.json
deleted file mode 100644
index f18f6f715..000000000
--- a/src/TransactionTestsFiller/ttEip158/TransactionWithSvalueEqual_c_secp256k1n_x05Filler.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "TransactionWithSvalueEqual_c_secp256k1n_x05" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-	"sender" : "b284109d8e781949638d995c19f8feba0268191c",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "27",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0x7fffffffffffffffffffffffffffffff5d576e7357a4501ddfe92f46681b20a0"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/TransactionWithSvalueHighFiller.json b/src/TransactionTestsFiller/ttEip158/TransactionWithSvalueHighFiller.json
deleted file mode 100644
index 41d8a5a48..000000000
--- a/src/TransactionTestsFiller/ttEip158/TransactionWithSvalueHighFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithSvalueHigh" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "27",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0xfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364140"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/TransactionWithSvalueLargerThan_c_secp256k1n_x05Filler.json b/src/TransactionTestsFiller/ttEip158/TransactionWithSvalueLargerThan_c_secp256k1n_x05Filler.json
deleted file mode 100644
index 434e6ed77..000000000
--- a/src/TransactionTestsFiller/ttEip158/TransactionWithSvalueLargerThan_c_secp256k1n_x05Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithSvalueLargerThan_c_secp256k1n_x05" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "27",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0x7fffffffffffffffffffffffffffffff5d576e7357a4501ddfe92f46681b20a1"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/TransactionWithSvalueLessThan_c_secp256k1n_x05Filler.json b/src/TransactionTestsFiller/ttEip158/TransactionWithSvalueLessThan_c_secp256k1n_x05Filler.json
deleted file mode 100644
index 879ac50c8..000000000
--- a/src/TransactionTestsFiller/ttEip158/TransactionWithSvalueLessThan_c_secp256k1n_x05Filler.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "TransactionWithSvalueLessThan_c_secp256k1n_x05" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-	"sender" : "33e931e187e9cb5b6f8560755519d54560dd63e8",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "27",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0x7fffffffffffffffffffffffffffffff5d576e7357a4501ddfe92f46681b2090"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/TransactionWithSvalueOverflowFiller.json b/src/TransactionTestsFiller/ttEip158/TransactionWithSvalueOverflowFiller.json
deleted file mode 100644
index 978abf0ca..000000000
--- a/src/TransactionTestsFiller/ttEip158/TransactionWithSvalueOverflowFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithSvalueOverflow" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "27",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f0000"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/TransactionWithSvaluePrefixed00Filler.json b/src/TransactionTestsFiller/ttEip158/TransactionWithSvaluePrefixed00Filler.json
deleted file mode 100644
index f1ea85283..000000000
--- a/src/TransactionTestsFiller/ttEip158/TransactionWithSvaluePrefixed00Filler.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "TransactionWithSvaluePrefixed00" : {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-	"sender" : "a825d77f343f31619c991cd7db5aaa6adbe9452e",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "27",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
-            "s" : "0xef0b28ad43601b4ab949f53faa07bd2c804"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/TransactionWithSvalueTooHighFiller.json b/src/TransactionTestsFiller/ttEip158/TransactionWithSvalueTooHighFiller.json
deleted file mode 100644
index bffbd1985..000000000
--- a/src/TransactionTestsFiller/ttEip158/TransactionWithSvalueTooHighFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "TransactionWithSvalueTooHigh" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "11",
-            "v" : "27",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0xfffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/TransactionWithTooFewRLPElementsFiller.json b/src/TransactionTestsFiller/ttEip158/TransactionWithTooFewRLPElementsFiller.json
deleted file mode 100644
index 082055ac9..000000000
--- a/src/TransactionTestsFiller/ttEip158/TransactionWithTooFewRLPElementsFiller.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    "TransactionWithTooFewRLPElements" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "v" : "27",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/TransactionWithTooManyRLPElementsFiller.json b/src/TransactionTestsFiller/ttEip158/TransactionWithTooManyRLPElementsFiller.json
deleted file mode 100644
index dec6b92aa..000000000
--- a/src/TransactionTestsFiller/ttEip158/TransactionWithTooManyRLPElementsFiller.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "TransactionWithTooManyRLPElements" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "10",
-            "v" : "27",
-            "r" : "0x48b55bfa915ac795c431978d8a6a992b628d557da5ff759b307d495a36649353",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3",
-            "extrafield" : "128472387293"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/V_overflow32bitFiller.json b/src/TransactionTestsFiller/ttEip158/V_overflow32bitFiller.json
deleted file mode 100644
index 6651b6fd4..000000000
--- a/src/TransactionTestsFiller/ttEip158/V_overflow32bitFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "V_overflow32bit" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "0x5544",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "3",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : "10",
-            "v" : "4294967323",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/V_overflow32bitSignedFiller.json b/src/TransactionTestsFiller/ttEip158/V_overflow32bitSignedFiller.json
deleted file mode 100644
index eb53bbc44..000000000
--- a/src/TransactionTestsFiller/ttEip158/V_overflow32bitSignedFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "V_overflow32bitSigned" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "0x5544",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "3",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : "10",
-            "v" : "2147483647",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/V_overflow64bitPlus27Filler.json b/src/TransactionTestsFiller/ttEip158/V_overflow64bitPlus27Filler.json
deleted file mode 100644
index 0f68bbf71..000000000
--- a/src/TransactionTestsFiller/ttEip158/V_overflow64bitPlus27Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "V_overflow64bitPlus27" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "0x5544",
-            "gasLimit" : "22000",
-            "gasPrice" : "1",
-            "nonce" : "3",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : "10",
-            "v" : "18446744073709551643",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/V_overflow64bitPlus28Filler.json b/src/TransactionTestsFiller/ttEip158/V_overflow64bitPlus28Filler.json
deleted file mode 100644
index 333c04264..000000000
--- a/src/TransactionTestsFiller/ttEip158/V_overflow64bitPlus28Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "V_overflow64bitPlus28" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "0x5544",
-            "gasLimit" : "22000",
-            "gasPrice" : "1",
-            "nonce" : "3",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : "10",
-            "v" : "18446744073709551644",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/V_overflow64bitSignedFiller.json b/src/TransactionTestsFiller/ttEip158/V_overflow64bitSignedFiller.json
deleted file mode 100644
index fd3e3345c..000000000
--- a/src/TransactionTestsFiller/ttEip158/V_overflow64bitSignedFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "V_overflow64bitSigned" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "0x5544",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "3",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : "10",
-            "v" : "18446744073709551388",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/V_wrongvalue_101Filler.json b/src/TransactionTestsFiller/ttEip158/V_wrongvalue_101Filler.json
deleted file mode 100644
index 8b6f132c0..000000000
--- a/src/TransactionTestsFiller/ttEip158/V_wrongvalue_101Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "V_wrongvalue_101" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "0x5544",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "3",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : "10",
-            "v" : "0x0101",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/V_wrongvalue_121Filler.json b/src/TransactionTestsFiller/ttEip158/V_wrongvalue_121Filler.json
deleted file mode 100644
index c8f81e2ed..000000000
--- a/src/TransactionTestsFiller/ttEip158/V_wrongvalue_121Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "V_wrongvalue_121" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "0x5544",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "3",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : "10",
-            "v" : "0x0121",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/V_wrongvalue_122Filler.json b/src/TransactionTestsFiller/ttEip158/V_wrongvalue_122Filler.json
deleted file mode 100644
index 12737c00b..000000000
--- a/src/TransactionTestsFiller/ttEip158/V_wrongvalue_122Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "V_wrongvalue_122" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "0x5544",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "3",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : "10",
-            "v" : "0x0122",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/V_wrongvalue_123Filler.json b/src/TransactionTestsFiller/ttEip158/V_wrongvalue_123Filler.json
deleted file mode 100644
index 94e738f9e..000000000
--- a/src/TransactionTestsFiller/ttEip158/V_wrongvalue_123Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "V_wrongvalue_123" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "0x5544",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "3",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : "10",
-            "v" : "0x0123",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/V_wrongvalue_124Filler.json b/src/TransactionTestsFiller/ttEip158/V_wrongvalue_124Filler.json
deleted file mode 100644
index dbe95b01b..000000000
--- a/src/TransactionTestsFiller/ttEip158/V_wrongvalue_124Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "V_wrongvalue_124" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "0x5544",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "3",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : "10",
-            "v" : "0x0124",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/V_wrongvalue_ffFiller.json b/src/TransactionTestsFiller/ttEip158/V_wrongvalue_ffFiller.json
deleted file mode 100644
index 45366d5c1..000000000
--- a/src/TransactionTestsFiller/ttEip158/V_wrongvalue_ffFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "V_wrongvalue_ff" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "0x5544",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "3",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : "10",
-            "v" : "0xff",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/V_wrongvalue_ffffFiller.json b/src/TransactionTestsFiller/ttEip158/V_wrongvalue_ffffFiller.json
deleted file mode 100644
index 483f67292..000000000
--- a/src/TransactionTestsFiller/ttEip158/V_wrongvalue_ffffFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "V_wrongvalue_ffff" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "0x5544",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "3",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : "10",
-            "v" : "0xffff",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/WrongVRSTestIncorrectSizeFiller.json b/src/TransactionTestsFiller/ttEip158/WrongVRSTestIncorrectSizeFiller.json
deleted file mode 100644
index ac75e64ef..000000000
--- a/src/TransactionTestsFiller/ttEip158/WrongVRSTestIncorrectSizeFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "WrongVRSTestIncorrectSize" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : "10",
-            "v" : "28",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a02c3",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/WrongVRSTestVEqual26Filler.json b/src/TransactionTestsFiller/ttEip158/WrongVRSTestVEqual26Filler.json
deleted file mode 100644
index a92a59148..000000000
--- a/src/TransactionTestsFiller/ttEip158/WrongVRSTestVEqual26Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "WrongVRSTestVEqual26" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : "10",
-            "v" : "26",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/WrongVRSTestVEqual29Filler.json b/src/TransactionTestsFiller/ttEip158/WrongVRSTestVEqual29Filler.json
deleted file mode 100644
index 85ffb1527..000000000
--- a/src/TransactionTestsFiller/ttEip158/WrongVRSTestVEqual29Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "WrongVRSTestVEqual29" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : "10",
-            "v" : "29",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/WrongVRSTestVEqual31Filler.json b/src/TransactionTestsFiller/ttEip158/WrongVRSTestVEqual31Filler.json
deleted file mode 100644
index 6c90bf63b..000000000
--- a/src/TransactionTestsFiller/ttEip158/WrongVRSTestVEqual31Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "WrongVRSTestVEqual31" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : "10",
-            "v" : "31",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/WrongVRSTestVOverflowFiller.json b/src/TransactionTestsFiller/ttEip158/WrongVRSTestVOverflowFiller.json
deleted file mode 100644
index 218a792b7..000000000
--- a/src/TransactionTestsFiller/ttEip158/WrongVRSTestVOverflowFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "WrongVRSTestVOverflow" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "",
-            "gasLimit" : "21000",
-            "gasPrice" : "1",
-            "nonce" : "0",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : "10",
-            "v" : "310",
-            "r" : "0x98ff921201554726367d2be8c804a7ff89ccf285ebc57dff8ae4c44b9c19ac4a",
-            "s" : "0x1887321be575c8095f789dd4c743dfe42c1820f9231f98a962b210e3ac2452a3"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/ZeroSigTransaction2Filler.json b/src/TransactionTestsFiller/ttEip158/ZeroSigTransaction2Filler.json
deleted file mode 100644
index 2534592fa..000000000
--- a/src/TransactionTestsFiller/ttEip158/ZeroSigTransaction2Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "ZeroSigTransaction2" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "0x",
-            "gasLimit" : "51000",
-            "gasPrice" : "1",
-            "nonce" : "3",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : "10",
-            "v" : "1",
-            "r" : "0",
-            "s" : "0"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/ZeroSigTransaction3Filler.json b/src/TransactionTestsFiller/ttEip158/ZeroSigTransaction3Filler.json
deleted file mode 100644
index 7f82e9916..000000000
--- a/src/TransactionTestsFiller/ttEip158/ZeroSigTransaction3Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "ZeroSigTransaction3" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "0x",
-            "gasLimit" : "51000",
-            "gasPrice" : "1",
-            "nonce" : "3",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : "10",
-            "v" : "2",
-            "r" : "0",
-            "s" : "0"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/ZeroSigTransaction4Filler.json b/src/TransactionTestsFiller/ttEip158/ZeroSigTransaction4Filler.json
deleted file mode 100644
index a70b45b6a..000000000
--- a/src/TransactionTestsFiller/ttEip158/ZeroSigTransaction4Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "ZeroSigTransaction4" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "0x",
-            "gasLimit" : "51000",
-            "gasPrice" : "1",
-            "nonce" : "3",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : "10",
-            "v" : "3",
-            "r" : "0",
-            "s" : "0"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/ZeroSigTransaction5Filler.json b/src/TransactionTestsFiller/ttEip158/ZeroSigTransaction5Filler.json
deleted file mode 100644
index 7e26539da..000000000
--- a/src/TransactionTestsFiller/ttEip158/ZeroSigTransaction5Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "ZeroSigTransaction5" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "0x",
-            "gasLimit" : "51000",
-            "gasPrice" : "1",
-            "nonce" : "3",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : "10",
-            "v" : "4",
-            "r" : "0",
-            "s" : "0"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/ZeroSigTransaction6Filler.json b/src/TransactionTestsFiller/ttEip158/ZeroSigTransaction6Filler.json
deleted file mode 100644
index b0054d3ec..000000000
--- a/src/TransactionTestsFiller/ttEip158/ZeroSigTransaction6Filler.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "ZeroSigTransaction6" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "0x",
-            "gasLimit" : "51000",
-            "gasPrice" : "1",
-            "nonce" : "3",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : "10",
-            "v" : "5",
-            "r" : "0",
-            "s" : "0"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/ZeroSigTransactionFiller.json b/src/TransactionTestsFiller/ttEip158/ZeroSigTransactionFiller.json
deleted file mode 100644
index 1f4cdd7a1..000000000
--- a/src/TransactionTestsFiller/ttEip158/ZeroSigTransactionFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "ZeroSigTransaction" : {
-	"expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" :
-        {
-            "data" : "0x",
-            "gasLimit" : "51000",
-            "gasPrice" : "1",
-            "nonce" : "3",
-            "to" : "b94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "value" : "10",
-            "v" : "0",
-            "r" : "0",
-            "s" : "0"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/dataTx_bcValidBlockTestFiller.json b/src/TransactionTestsFiller/ttEip158/dataTx_bcValidBlockTestFiller.json
deleted file mode 100644
index 882f89664..000000000
--- a/src/TransactionTestsFiller/ttEip158/dataTx_bcValidBlockTestFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "dataTx_bcValidBlockTest": {
-	"expect" : "valid",
-	"sender" : "db3271a5b88f7bae59660418e25ce5d142f9b080",
-	"blocknumber" : "2675000",
-        "transaction": {
-            "nonce": "0",
-            "gasPrice": "50",
-            "gasLimit": "80000",
-            "to": "",
-            "data": "0x60056013565b6101918061001d6000396000f35b3360008190555056006001600060e060020a6000350480630a874df61461003a57806341c0e1b514610058578063a02b161e14610066578063dbbdf0831461007757005b610045600435610149565b80600160a060020a031660005260206000f35b610060610161565b60006000f35b6100716004356100d4565b60006000f35b61008560043560243561008b565b60006000f35b600054600160a060020a031632600160a060020a031614156100ac576100b1565b6100d0565b8060018360005260205260406000208190555081600060005260206000a15b5050565b600054600160a060020a031633600160a060020a031614158015610118575033600160a060020a0316600182600052602052604060002054600160a060020a031614155b61012157610126565b610146565b600060018260005260205260406000208190555080600060005260206000a15b50565b60006001826000526020526040600020549050919050565b600054600160a060020a031633600160a060020a0316146101815761018f565b600054600160a060020a0316ff5b56",
-            "r" : "0xc5689ed1ad124753d54576dfb4b571465a41900a1dff4058d8adf16f752013d0",
-            "s" : "0x1221cbd70ec28c94a3b55ec771bcbc70778d6ee0b51ca7ea9514594c861b1884",
-            "v": "28",
-            "value": "0"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/invalidSignatureFiller.json b/src/TransactionTestsFiller/ttEip158/invalidSignatureFiller.json
deleted file mode 100644
index 914b67bb2..000000000
--- a/src/TransactionTestsFiller/ttEip158/invalidSignatureFiller.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    "invalidSignature" : {
-        "expect" : "invalid",
-	"blocknumber" : "2675000",
-        "transaction" : {
-            "data" : "",
-            "gasLimit" : "1000000",
-            "gasPrice" : "0",
-            "nonce" : "0",
-            "r" : "0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-            "s" : "0xbadf00d70ec28c94a3b55ec771bcbc70778d6ee0b51ca7ea9514594c861b1884",
-            "v": "27",
-            "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
-            "value" : "100000"
-        }
-     }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/libsecp256k1testFiller.json b/src/TransactionTestsFiller/ttEip158/libsecp256k1testFiller.json
deleted file mode 100644
index 9d5078df8..000000000
--- a/src/TransactionTestsFiller/ttEip158/libsecp256k1testFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "libsecp256k1test": {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-	"sender" : "170ad78f26da62f591fa3fe3d54c30016167cbbf",
-        "transaction": {
-            "nonce": "0",
-            "gasPrice": "0x09184e72a000",
-            "gasLimit": "0xf388",
-            "to": "",
-            "data": "0x",
-            "r": "44",
-            "s": "4",
-            "v": "27",
-            "value": "0"
-        }
-    }
-}
diff --git a/src/TransactionTestsFiller/ttEip158/unpadedRValueFiller.json b/src/TransactionTestsFiller/ttEip158/unpadedRValueFiller.json
deleted file mode 100644
index 560b299a3..000000000
--- a/src/TransactionTestsFiller/ttEip158/unpadedRValueFiller.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "unpadedRValue": {
-	"expect" : "valid",
-	"blocknumber" : "2675000",
-	"sender" : "c1584838993ee7a9581cba0bced81785e8bb581d",
-        "transaction": {
-            "nonce": "13",
-            "gasPrice": "0x09184e72a000",
-            "gasLimit": "0xf710",
-            "to": "7c47ef93268a311f4cad0c750724299e9b72c268",
-            "data": "0x379607f50000000000000000000000000000000000000000000000000000000000000005",
-            "r": "0x006ab6dda9f4df56ea45583af36660329147f1753f3724ea5eb9ed83e812ca77",
-            "s": "0x495701e230667832c8999e884e366a61028633ecf951e8cd66d119f381ae5718",
-            "v": "28",
-            "value": ""
-        }
-    }
-}