1529 files changed, 2746 insertions, 1239 deletions

diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d0g0v0Filler.json
index f89d7f2c5..5be4cc25f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d0g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160015800006000f3",
+                        "data" : "0x600160016001600160016001600160015800006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x9a30dbec3e7a3cb69c8365cd705162dfd760cf455b78f619152558de7cd63ca3",
-                        "s" : "0x7c7ca74d7c8691d75d71b068ccefab743fddd32ed845018dec5e3aca8e671464",
+                        "r" : "0x50b38abc8c792f0cbf4881ddc640eb69ffb38097524039589b85e4c2a6dc0426",
+                        "s" : "0x0a52e1f6e1dc2d9b5f859ce184dadddc78a57a5d6ca04e4e5b5b2f69bda52644",
                         "to" : "",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d100g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d100g0v0Filler.json
index 39aca1699..3b7a84f3a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d100g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d100g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001e160006000f3",
+                        "data" : "0x60016001600160016001600160016001e160006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xade82f766582ad73293aa4dca336b49f5f717648df69058c4134676d6bf7a372",
-                        "s" : "0x5fecfa730a9acd09427f4ff342f483cc44a31633a5cb2e082b348a178817d5f3",
+                        "r" : "0x2af847b6d1be0969873b3800203a7ecd3bd0541917a018b2b5023e23b158b0d6",
+                        "s" : "0x65462358445c30410eaff38c27145ccb3424a43bd706a3afb15339d3e6f7696f",
                         "to" : "",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d101g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d101g0v0Filler.json
index 3cdbb6ffe..38aacbba5 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d101g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d101g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001e260006000f3",
+                        "data" : "0x60016001600160016001600160016001e260006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x30f263bf2d590b5812095baa3dd9e2b143f2a84860a9a351e2149f15b3d03868",
-                        "s" : "0x4c836be39d2bdcfdf0f56a81223f6940e9f519f4927ced9c55ff1ca80b7109b8",
+                        "r" : "0x07240c7baf76e9ce2b50d8d267da8857a386f65f8fdf78ba37b61c7faa352d72",
+                        "s" : "0x09a65b333ce2e2f9bb73e303aae817e00dcbbbb002c89f8800de8f70a80fbcc2",
                         "to" : "",
-                        "v" : "0x1c",
+                        "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d102g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d102g0v0Filler.json
index 0af64c9c4..c8f7b80a4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d102g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d102g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001e360006000f3",
+                        "data" : "0x60016001600160016001600160016001e360006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x1a17beb443c363ac18fd48f95da18c78bc5ec7524510be17bb06801601c33e02",
-                        "s" : "0x2c1167b6c4b1396f9c45960fce30f420822131890af1532b7d384f1ef484ddf5",
+                        "r" : "0x5890382c6b51b968ccea3823713508c58ad94c3c30a4df2a1158c7f013fb4203",
+                        "s" : "0x1f97d037fe360fefc128c38cf49b0c21bf79d448c2f26aa7823b304b4564afd8",
                         "to" : "",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d103g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d103g0v0Filler.json
index b6e322862..2dceac7db 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d103g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d103g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001e460006000f3",
+                        "data" : "0x60016001600160016001600160016001e460006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xe1a6744671a8f9f4167e69905b06e49602275304ac26ce8840e4895a4681a4f4",
-                        "s" : "0x0db3ce5a2196b8c46f13686a327a78a7282f0d525d3ddba3e218dc40e27961f0",
+                        "r" : "0x864a0040b49377bc233bf45b756358c6f0c48183afe1667be023410a8f9d9a98",
+                        "s" : "0x24c170202250f862cc0d3b640a82331364dbdfba1fa341f00bf6b2ab3e2e4bb1",
                         "to" : "",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d104g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d104g0v0Filler.json
index 8cd7c13a8..7c7f627c4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d104g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d104g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001e560006000f3",
+                        "data" : "0x60016001600160016001600160016001e560006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x855524ec68ee17828386cc8d0cd37983304c68dc1f376a35a1308dfa396758f1",
-                        "s" : "0x45e540897c458d3d847cb2898c230ac9e1a00ea2e626a23d7e50d6a54b0cbd2c",
+                        "r" : "0xaf4cdc2a7c5d06e9ab648a9ac3c2c26e228c3b52ab99a385d46f48ff6de66ba4",
+                        "s" : "0x18799501057e160e6eac9ec758b938e5f7ab6298e74759a7297d3fdb0bad3106",
                         "to" : "",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d105g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d105g0v0Filler.json
index a68ab563c..aa8423857 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d105g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d105g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001e660006000f3",
+                        "data" : "0x60016001600160016001600160016001e660006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x75d976512f32a59df085fbcbd84bf0dc47234f11b772a11a960c288205a4700b",
-                        "s" : "0x248c17d5538d78dcf4ae1ef6a61bcd9179a62945bb4d3b98ef7c240f6f01fdd7",
+                        "r" : "0x04eeb771474dc41a12aad36ff04dd799067a63f321ef0bcb8fc92076db9b9b4d",
+                        "s" : "0x5f3d70a3ac14e7893c69237d4a3b53b005b8c02ccc56f96a8d89667a1a9a5512",
                         "to" : "",
-                        "v" : "0x1b",
+                        "v" : "0x1c",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d106g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d106g0v0Filler.json
index c9155e5be..a6f3fec8f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d106g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d106g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001e760006000f3",
+                        "data" : "0x60016001600160016001600160016001e760006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xf587df806f5fe7e2ec75ddb935086d7d10d7b66b03124170261ca03a3aa64f4e",
-                        "s" : "0x17b4e9e47b97f8e2ada8527a79c453bc8631a074975bd6ffbd8a2ddec76598ce",
+                        "r" : "0x1e2e31e2fa76ecd6095b42f17b02b88725c93bb8bc3e7e311092c987ff6e434f",
+                        "s" : "0x26025d0291c798152c3cb4dc061e3018ff5253eb10f4c9b6b00aacf2bd546f9f",
                         "to" : "",
-                        "v" : "0x1b",
+                        "v" : "0x1c",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d107g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d107g0v0Filler.json
index 9a300c33c..9aa7b3d40 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d107g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d107g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001e860006000f3",
+                        "data" : "0x60016001600160016001600160016001e860006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xff959020fdfc7a2fdd5e16db7bf562b76a5a25e1a7dd37bb9ec2be4c5f3757a2",
-                        "s" : "0x36ec41ef765f67b3c501d09c3797263762a7122eb2e2227b707d0e198bc338a9",
+                        "r" : "0x23eeb60b9409e2af95ece64957de552f3a23f4a1ad93041b9ca63f774072ff37",
+                        "s" : "0x2384570074ce6d04fac7cfc3a438a79a08fd6bf06180d4e1f92531b1b019e9d0",
                         "to" : "",
-                        "v" : "0x1c",
+                        "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d108g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d108g0v0Filler.json
index 12bb6ef91..994faf7ed 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d108g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d108g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001e960006000f3",
+                        "data" : "0x60016001600160016001600160016001e960006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xb72ed8461da4a34039542bfce0df927c62de0619f57e0510f967f4dc23ae1554",
-                        "s" : "0x52183f19df7fb0a6d3c77819730b847102043cd4b47a36dbb5d97789039afe5d",
+                        "r" : "0x67cf01cc44d78d293aa7d82407f5d9952295e525ab52826357a3e7346ec13bd1",
+                        "s" : "0x163961836a22680e4bc12bee2780f9bdb7bc3d282589cbcad0c1f2dd156395f3",
                         "to" : "",
-                        "v" : "0x1b",
+                        "v" : "0x1c",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d109g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d109g0v0Filler.json
index a9504ae6c..9a8044f57 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d109g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d109g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001ea60006000f3",
+                        "data" : "0x60016001600160016001600160016001ea60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x406a2a45f0ae389d8855a3c39e9df9984ebc211857b87d47586e2cc012abd450",
-                        "s" : "0x458a19082a2c07d91626196ddd7a4136822cdf7559ba255e9f2f9e7ce719c55d",
+                        "r" : "0x148d1919a3cf9a78e1f87be0f42626ce3fd469c726d9736302652cc0aeee1e7b",
+                        "s" : "0x6eec1a574fd51fd8395011e02c5d10e97a592b148ae79d73a03209ca817d63fc",
                         "to" : "",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d10g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d10g0v0Filler.json
index 615c852ec..f3fece4bd 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d10g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d10g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160012160006000f3",
+                        "data" : "0x600160016001600160016001600160012160006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xdd4254badfef703d7d8a1b35190bfda5c063c077d051c2c8cf6d963bdaa62dff",
-                        "s" : "0x2a117d27a9559c317a713c9cb164820993f957da7300471694b151ad886631c3",
+                        "r" : "0x73e42ea4e59c6df2acb9e4804eeb6976396c9914290eeadba25402ca934ed509",
+                        "s" : "0x597670729f58b42ce3693a9c3f147a892974a5b64da441ed62f2edbf5a28ddc9",
                         "to" : "",
-                        "v" : "0x1c",
+                        "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d110g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d110g0v0Filler.json
index 2ebbbe1b4..3b3905313 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d110g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d110g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001eb60006000f3",
+                        "data" : "0x60016001600160016001600160016001eb60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x2541d8b59f2bcd991d18cccf2104e4e540eebaa20ee72bc9049a590b87ab555d",
-                        "s" : "0x5b85e51d1f8510adc1017a7e31e69638b71e556e762577114efa89930aa7f5f0",
+                        "r" : "0x2762b72567486477e316f009d6368680738e73e31f86f64d3a0ad840e5d95a86",
+                        "s" : "0x1e378b55f484f5e5e41bc4ed9e5119dacca8a1867ff2a2c3b9b5cc6a9aeffbd2",
                         "to" : "",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d111g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d111g0v0Filler.json
index db65c0faf..b7fa6b957 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d111g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d111g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001ec60006000f3",
+                        "data" : "0x60016001600160016001600160016001ec60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xad00ef866bca67d5c2f71abbf4f62319aafe4eb7d44987490d1f471ce4afb86d",
-                        "s" : "0x3fd435ac4102bebafda24986417373edac715a1fa9fd0803b361f32a1c055593",
+                        "r" : "0x7234a6d44c4e2032e536a994b6ea7da2923b032377f077a92646b92a374571a1",
+                        "s" : "0x0bcf15d48383a4a81c39089a6a10efcb99a480249e0242fcfae601a60a98e648",
                         "to" : "",
-                        "v" : "0x1b",
+                        "v" : "0x1c",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d112g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d112g0v0Filler.json
index 578a40004..0f65da5c8 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d112g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d112g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001ed60006000f3",
+                        "data" : "0x60016001600160016001600160016001ed60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xde2171c3a4f4329c38bd7a0d9db564b60871f6564da518c4aebac92c093ff501",
-                        "s" : "0x3ea55072ba825184669c864ecddd46596e05988fb1f9137a26e266ebc670b8cc",
+                        "r" : "0x6152762cebdf2d514b3817a2b360b681c8b6aad6a6364f3309cec19cd6ee636f",
+                        "s" : "0x196a86da1e2b4eaf7d5f1825c1cc76a63f912a15442d771c17faa5edb5745c37",
                         "to" : "",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d113g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d113g0v0Filler.json
index 085737fde..00f8247dc 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d113g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d113g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001ee60006000f3",
+                        "data" : "0x60016001600160016001600160016001ee60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x70f5563b8dae3352dcc9d77c8f948cc21f916065b70ddc160bde0f9c42a9aa0d",
-                        "s" : "0x08ac79629cc9f92a46ded12e76f3a93fe7345a1d7a17c8193974057306f36bb6",
+                        "r" : "0xf0fcb8b20ba5ce4680f36c73d218907ba555f8c50322c71b0bf0b21ed85ccfdb",
+                        "s" : "0x5f4189a3cc09377ac2a9ad04b1e7204872359da378afb58563c96475ccbf3d54",
                         "to" : "",
-                        "v" : "0x1b",
+                        "v" : "0x1c",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d114g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d114g0v0Filler.json
index 2f7c04e70..8d982281d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d114g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d114g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001ef60006000f3",
+                        "data" : "0x60016001600160016001600160016001ef60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xf2cd1ef6b56d79efb8e2961aac4b88f1b51e2f1086963435bb4cb8c598bb28fd",
-                        "s" : "0x2aac59c2a881c66fb8c655117d02e2eafdc9ea2c8a1ccc4ef602db2f62de8264",
+                        "r" : "0xe5f2c467a83be6b2408e8d3c282ed14cc0ece095de4c86231895c586da767d62",
+                        "s" : "0x7eeb0ad1f0f86fca87e4ba77c7fc72f89eaf32164a5022eba2fd0f55b3bf50a5",
                         "to" : "",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d115g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d115g0v0Filler.json
index 666fa6c36..8b4506e61 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d115g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d115g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001f560006000f3",
+                        "data" : "0x60016001600160016001600160016001f560006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xbbf1120688a7915ac4e4feff3f3b9345d78596f614eb27cb572737ad2dd0675d",
-                        "s" : "0x3b77ceeef23e5c74f384d142b459d4a83b4603447879f1556130ea6955d4b316",
+                        "r" : "0xc6aae4338d81e77b049e6eebe0b5363c0bcc1c9d04d190860b5b36f804e96162",
+                        "s" : "0x348ccf1f9d021e1feb155eac20dfa0df0e43eb2d013bedd4fce8918f381f93ad",
                         "to" : "",
-                        "v" : "0x1c",
+                        "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d116g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d116g0v0Filler.json
index 3db6634f2..3412f1ef5 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d116g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d116g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001f660006000f3",
+                        "data" : "0x60016001600160016001600160016001f660006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xc292c186008994ed78a5ff2e6c5f495fd6a96d6299422b0443ac8bb12415d641",
-                        "s" : "0x5a93df7696bceb497ff620592922d6483f971af58d06cc66b9d28816c91d931e",
+                        "r" : "0xdc720a17e87a6e752baac91b3f11425232630d51cdba0521ad1db10d33445cb0",
+                        "s" : "0x06e4d52a111116121aca9f7a6e61f26d4625dc4546ab95bf56e30c9c38a703bb",
                         "to" : "",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d117g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d117g0v0Filler.json
index 258aee4aa..8d23ad7f7 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d117g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d117g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001f760006000f3",
+                        "data" : "0x60016001600160016001600160016001f760006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x7264fe8aa2825510bde4d096a2c63572d8e251d744e2d296fdb5e77b7fc9236b",
-                        "s" : "0x65d6c1836dc5db356297564ce9a45ab57569983b7f838f878d2209e889ae9833",
+                        "r" : "0x260b748234a3ea0a03a0283f26f40de5afb69fc1925c6a31084c6c34bd453e9e",
+                        "s" : "0x4d7227c01276d98482558a3f298cca28464f4210fe7505995de35266dfec410c",
                         "to" : "",
-                        "v" : "0x1b",
+                        "v" : "0x1c",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d118g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d118g0v0Filler.json
index 0bf2718ec..21416d6b7 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d118g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d118g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001f860006000f3",
+                        "data" : "0x60016001600160016001600160016001f860006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x705eaca671e19f2db013a29ee4658be074c08e8d3362f977ef97d51d181c04ad",
-                        "s" : "0x03b0c80735221bb0d64d0aa9966c5b2f94f9a9105b04c7f8fc1da0be53383bf5",
+                        "r" : "0x84e1d5957a12b4dced440b2b1b3077715e42f9bb5c0f99868c345d885a32ae95",
+                        "s" : "0x6655bb03094ed76c39911a4e2084ff1219ca41f82d21eef1c8a354bb69be995d",
                         "to" : "",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d119g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d119g0v0Filler.json
index e081d8bbf..7953c631c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d119g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d119g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001f960006000f3",
+                        "data" : "0x60016001600160016001600160016001f960006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x0fdff90e49d23ecbae97cea4d9d3c6e97f750b7fec96ddb54ba40fda571b5e57",
-                        "s" : "0x533aef8626a96288b334da5b5a7d4468ff45d36b11ce193114cd539fec0b9208",
+                        "r" : "0xb5ea0bee694ff8b21c629ead0e6255086f37544de92a0ae559c97665d0ec7acb",
+                        "s" : "0x530183aac33dd44b00d3a725fd8fecba67f801331c30db233311fc43e3f7dc2d",
                         "to" : "",
-                        "v" : "0x1b",
+                        "v" : "0x1c",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d11g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d11g0v0Filler.json
index a3741fe26..43dfdbdd7 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d11g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d11g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160012260006000f3",
+                        "data" : "0x600160016001600160016001600160012260006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x4ce3cc0fcb9381217497d16b97d4b971dd0589770b854e3386f2e67612091534",
-                        "s" : "0x6ee5ee817cc76b596b356bd6a87d80bdd980f94937833881bb53bc07979a3953",
+                        "r" : "0x8be8b1bddec93b0e272bf08d6070a532f1162d63e1d8ef879599a2da0eeaf0db",
+                        "s" : "0x0feaafcb8c2608c5d904ab42de6e6abfa6ad0fccc22c5b1d12d127778407c271",
                         "to" : "",
-                        "v" : "0x1c",
+                        "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d120g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d120g0v0Filler.json
index 966edc5e1..e055d795e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d120g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d120g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001fc60006000f3",
+                        "data" : "0x60016001600160016001600160016001fc60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x26f3b2fb9398a327a93d196ec987e3c034e0ecef181cff15a5839b638ddd0c04",
-                        "s" : "0x067782b86994a115af76c97488d851fef67ed2dcdf209310ff394b6f7b1b5e7a",
+                        "r" : "0xe7bd6acee5e3b5fed4c24d27b39996794f302e0f9efa9a5e7b09a4e48dca1806",
+                        "s" : "0x2878efae192fc31c3fa588277ccbd3c8fd05ada53ba88341deb6aa8f291bc390",
                         "to" : "",
-                        "v" : "0x1b",
+                        "v" : "0x1c",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d121g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d121g0v0Filler.json
index 29159c703..86f20743e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d121g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d121g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001fe60006000f3",
+                        "data" : "0x60016001600160016001600160016001fe60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xe7b67fd56b90fe30e6fec3e87a9319a1938813f26938e13c3c073b2eb6433dea",
-                        "s" : "0x6e59c12c62dc1347d0f1b566d154093c85c0e019d25f9f89aba91bb708ede2f1",
+                        "r" : "0xcb53eeeec5599c5a3f3034e4749ec67004a32fc8a420eb3e5c4bbe281384c8a6",
+                        "s" : "0x544a0caee6f22d0284a45e9f7dadb4910735892370bd23c6618ed042a9ee28ae",
                         "to" : "",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d12g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d12g0v0Filler.json
index efb10d06f..d8c15af43 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d12g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d12g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160012360006000f3",
+                        "data" : "0x600160016001600160016001600160012360006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x46411c1bc9b0d54d73c1842dd8926bb11ac51eacf4f43b35d497339e67d860ee",
-                        "s" : "0x290b7c40e17c1afaa6d33eddab10cb2fdb3c7963864fb164c3f5f31fe7c52e5a",
+                        "r" : "0xac38d503745f81125865b35c4449761bc8adc9dec7015106e1ea97b284701ae0",
+                        "s" : "0x3e3340f8f3285b8555ed047d64b23418a0d7aeff20f97bfd10611e99bfdbca34",
                         "to" : "",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d13g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d13g0v0Filler.json
index 83313dec9..323ec497d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d13g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d13g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160012460006000f3",
+                        "data" : "0x600160016001600160016001600160012460006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xbdd5961e4288d7c06a2fb26bd2c930e668c5d9ec09cc40b131706a2861bfc8df",
-                        "s" : "0x79d02cad8c374fa13c417193f12fac9bcfb690239a82edb1b8219aa0fdfad91a",
+                        "r" : "0xca47dbf3e49340f85c27dd51397e694147217f5e417dd2f19c42b01e04e0162b",
+                        "s" : "0x3a9cb74d11a9dd7b6ac044a8f9c3e447f09dd2c7a11cbb42963ad4d042f4fa20",
                         "to" : "",
-                        "v" : "0x1c",
+                        "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d14g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d14g0v0Filler.json
index ffa899db2..1a7fe73fd 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d14g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d14g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160012560006000f3",
+                        "data" : "0x600160016001600160016001600160012560006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xa6c010e9b2a7268470c2f14505afc467a8a57c18f5443fab4d5a79a5ee4e5784",
-                        "s" : "0x757afbe89fb363454b0ae3e90044e5b13d0d04e822b6d6375da6eebe16d55b3c",
+                        "r" : "0xe459da880aaa997de8b0b510064ab993ce9694c7d678793bacdc135ec57e2ed0",
+                        "s" : "0x7c46a2e70c1b83c6b490da7987bafb8a629590f1f054d0da5a2039d250f91281",
                         "to" : "",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d15g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d15g0v0Filler.json
index 0faf9ab58..f51c60970 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d15g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d15g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160012660006000f3",
+                        "data" : "0x600160016001600160016001600160012660006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x135f889258fc0a2788f47e5d68ecf95c4c610f75b16321463314d7b304e33460",
-                        "s" : "0x1e888fe1cd39afc9fc73e4f8553776c66dca8d54c47425813dad2acf78ccf76d",
+                        "r" : "0xbe40332491bee5ddcb224efd066ec768315e54ce973e4b187ef5284bbd6c5088",
+                        "s" : "0x3a8ee80c898f80f5d6f8032259d0c7a8a8ec302573e8e8069ba92181d24f1b1f",
                         "to" : "",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d16g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d16g0v0Filler.json
index dc8e9397b..99cce95fb 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d16g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d16g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160012760006000f3",
+                        "data" : "0x600160016001600160016001600160012760006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xa214b4a8c12be23e23c4282bf8fce4c8967f7b8d62bbe0ee8df65d0fe41e2992",
-                        "s" : "0x737e867bed2a2ac227dd709e3da50d9fbccebcac14f8dbdde98ddbe0525038dd",
+                        "r" : "0x1dc0fa31ff7063717057021ab3752af60189edbee0e4c47a354527fcd32bece4",
+                        "s" : "0x3294a86b682a55b35205cd24c24f53a095247689cf7dc19d60ef21fe04c9c34a",
                         "to" : "",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d17g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d17g0v0Filler.json
index 276c1f8b4..e02116b3a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d17g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d17g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160012860006000f3",
+                        "data" : "0x600160016001600160016001600160012860006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xdf0f295051551e84bf508eb8ba317d06d66742dd55388992ca4f38d921f76f92",
-                        "s" : "0x163ebc572002bd11d304a9deed172c5805c6023261361eccbd7dc4531c9e72a7",
+                        "r" : "0xb4faf32d42c7ebaf1bfd74723f868e815bf8bc11c5e808fff3eac997f677b57b",
+                        "s" : "0x79e7a1bf5cd86f68de0333c0d822c7265c669895280b45c94a5dd5a2d1fe17a7",
                         "to" : "",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d18g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d18g0v0Filler.json
index 8c1abd3c9..a549d102b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d18g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d18g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160012960006000f3",
+                        "data" : "0x600160016001600160016001600160012960006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x20c5a4d9a847038a102c4d1c8d3996c118fe2f1b82198a7f8542d0fc2691eda0",
-                        "s" : "0x31309426f594ef879c56ad80603caff18288e79ca9517426e82120d1294fc045",
+                        "r" : "0xcaaa2a0cba0aafbfb8a08be4fb70af46626af1ac54de6b314a2aa6344d55ffb7",
+                        "s" : "0x1efab2d0c206a909e92c4bd1dc84e294c5cd5e8d2f2c9f379309667d57b10e70",
                         "to" : "",
-                        "v" : "0x1c",
+                        "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d19g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d19g0v0Filler.json
index c4fa20ba3..8626a58eb 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d19g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d19g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160012a60006000f3",
+                        "data" : "0x600160016001600160016001600160012a60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x3053a6734500eeb185b6bbfb1e72a4d58e775c6d86995bd8773f2ad8455cb5fa",
-                        "s" : "0x57147f826e806f7978d953ff45e2cd4ac84585c1c650d8c9cb56e223bc23190e",
+                        "r" : "0xc55f0f6297c6c497ee3492c927283c50a3e09b0be01ba16cd9557d6b382931b0",
+                        "s" : "0x4fbb760ce85486569870f55d9b3523458d9ad8c92d3f4e26b2b51e0152dd4582",
                         "to" : "",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d1g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d1g0v0Filler.json
index a4ac2b62b..842a147cc 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d1g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d1g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160010c60006000f3",
+                        "data" : "0x600160016001600160016001600160010c60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x12941bf4fe9d3f1a237dfd2e44f85d103fec0456437e454a9e6fe3f5a14f0432",
-                        "s" : "0x27f54ef22fe1626bb9f5cb49edb00323d9da2cbe5f5bf574f2a97b0d60e68a9b",
+                        "r" : "0xccec4cc3c1eda4104b7e969efea9c723b75b6064d660749e4d90e70bd5ce6e41",
+                        "s" : "0x20930584d8f80ff27128cbf3dca385197f6ccc50687293db9c8b122f1c71c586",
                         "to" : "",
-                        "v" : "0x1c",
+                        "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d20g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d20g0v0Filler.json
index 961b62744..6ed5483cf 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d20g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d20g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160012b60006000f3",
+                        "data" : "0x600160016001600160016001600160012b60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xa45fae2343ddcb5e7bf01f1457db1df13a2143754aaa4fd48b098a9ff0a6a3",
-                        "s" : "0x20bb44d47c388ca34a2fdc7ace74d72d84cbeadd67ac0f7d5745789605ab368e",
+                        "r" : "0x579f9d34cc1486f59a197d885ca32c74e86dfbd8331e220b725e68725e4f3dd6",
+                        "s" : "0x2594b462fe1fb505c01c7aa8cc2622dc95ec0e413360a7d04af9649f8b49b8ec",
                         "to" : "",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d21g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d21g0v0Filler.json
index 32e58e717..b8de597dd 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d21g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d21g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160012c60006000f3",
+                        "data" : "0x600160016001600160016001600160012c60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xef3128ac48564b9560c25cbcdc4cd50d3a93c0ff8b000b289213a33c3c1308fe",
-                        "s" : "0x37e5970b492baf14432402b365ca36ce26009584424af7b9f1cf8e30ee68c166",
+                        "r" : "0xdb2da2eb46e5a0c8ca4f223da50ef967044ad6dac0405b3093dc22cf735e360b",
+                        "s" : "0x6524a1e92f942ca07f729a092973deef2e83dd08a4ea4276d4a14d2e15a9ae83",
                         "to" : "",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d22g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d22g0v0Filler.json
index bd83524de..06eeaef29 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d22g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d22g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160012d60006000f3",
+                        "data" : "0x600160016001600160016001600160012d60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x26c9c2e0da231c7a0b8314dc7d8c6367cca8249e9c17c2776421cca92fc7f940",
-                        "s" : "0x3e0bc75f1f10bd6bdc0529f02c2c81b70bb1f46b45b9aa2284a23b61c821ae45",
+                        "r" : "0x3429b200cb814003becc2360ef510dca732922455066d45adc3d4dc09b698b14",
+                        "s" : "0x1ded7dcdd3ae4506c26a4f1f0ea6975e11cfacec64fb2a8afd9899593c9dbc57",
                         "to" : "",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d23g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d23g0v0Filler.json
index 9b9a33be9..7cc6871f7 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d23g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d23g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160012e60006000f3",
+                        "data" : "0x600160016001600160016001600160012e60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x79380017eea9ef1128c64f3fd1689471085f6016fa17c7b08dc8dca840e6756e",
-                        "s" : "0x7919557b2329d25318ad3fa3e47077194912649b804abae324e0358750c5aec4",
+                        "r" : "0xe381a6461dc6ceda7ec06f6a5b64416ff1bdc386709f95badc37522d75078f6e",
+                        "s" : "0x4bfb9528817a4b972370b416343741e5a041b590d536a7e7b930e77870fafe39",
                         "to" : "",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d24g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d24g0v0Filler.json
index 315b43935..1e772b609 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d24g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d24g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160012f60006000f3",
+                        "data" : "0x600160016001600160016001600160012f60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xf56616759a700a2c224d6ff5d1659def47eb621a14bb41ff8e6ca4709d0c3649",
-                        "s" : "0x29e022dbc4997ccd178ee888c62bfca523648240ef77ed1eda0e0dfe4f5d2e79",
+                        "r" : "0x88e82395999ce5d7778f5cdc66587edfa3dd3fbe5ecac5ed52635eb046ba14a7",
+                        "s" : "0x2efc9095bc039b02411dc103e8c5ef65017c362cd0afeb1d692da08fff0bdd3b",
                         "to" : "",
-                        "v" : "0x1b",
+                        "v" : "0x1c",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d25g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d25g0v0Filler.json
index 2d03e581d..d4779151e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d25g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d25g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160013f60006000f3",
+                        "data" : "0x600160016001600160016001600160013f60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x19ec92d84d96f83e6355370f808741b58f8fda2cbcc148d4999dae66c49bf8c7",
-                        "s" : "0x2b71a101fb6c5a965381fca60fa3b64f73c798030871500c52fa83a75d98ed71",
+                        "r" : "0x7672af9361cd4a37867d8422fd62ed3f90dc811446017693a94593f45d8ea2b8",
+                        "s" : "0x7849cc41ca5ca86d817f3731c48e49b5186387c640addf70a80ebc17f388c03f",
                         "to" : "",
-                        "v" : "0x1c",
+                        "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d26g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d26g0v0Filler.json
index 3919f9400..bda3dd95f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d26g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d26g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160014660006000f3",
+                        "data" : "0x600160016001600160016001600160014660006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xae3c9f8a7bbd72baa235c0f53459bf549ecc84c90b68f5e105d18021f4837f18",
-                        "s" : "0x0352f215586c4ca45e12a6009d313b2fec1de3daf9a553f892db676846a41832",
+                        "r" : "0xcfabb8efa14fbc44e8b3b4a9523475866be1c8e906f767af5ad58204ee733d31",
+                        "s" : "0x2b66fe9696263b39037f98b4fafecb50f4a71003bde7c5b23416e80da2027105",
                         "to" : "",
-                        "v" : "0x1c",
+                        "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d27g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d27g0v0Filler.json
index dfe3f7a54..4dea4e685 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d27g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d27g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160014760006000f3",
+                        "data" : "0x600160016001600160016001600160014760006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x3676190bb64cf6d5832434d28bd86c0665c199a85bdceab4aaec144ece0a0249",
-                        "s" : "0x10513ef65d3fd6bc98e82de102c98cfbcda6f89745c33a285eaa8b848252f23a",
+                        "r" : "0x1aafb3a62dad4de4f55685af038ee5f6756648826ae1f5e4a9c6bbe9e6b387cd",
+                        "s" : "0x40982ab054ab1f20a71fccb8ed0a545ce3be24a0f75d27af04ad4eb8af778d13",
                         "to" : "",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d28g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d28g0v0Filler.json
index 2e3be9291..686ae98ef 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d28g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d28g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160014860006000f3",
+                        "data" : "0x600160016001600160016001600160014860006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x5a3b055ee3a607aaff7d8cb909ac4513ff7be7f9aaa9f42ab3fc9a52b2b1cbbd",
-                        "s" : "0x18e7591969b4dcb5898007290ed287948469890f0fa68769f3e97a777b7679fa",
+                        "r" : "0xc4e043472fd871fc7a21eba17cae68c89d968c170b05d1ce072a812abc504f3c",
+                        "s" : "0x05d010cade5c7a6fb12b7de43d8e2ef03dd8a16e6191d285c292fddc1057724b",
                         "to" : "",
-                        "v" : "0x1c",
+                        "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d29g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d29g0v0Filler.json
index f1b2252f6..88d8a1908 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d29g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d29g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160014960006000f3",
+                        "data" : "0x600160016001600160016001600160014960006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xb8a94b79275771f0e5d8958b9c6ed79d63c7336224d0fb3e3c0a68df1fcbd5cf",
-                        "s" : "0x5f7979937c344b9484e4cf227a3a205abcd5b3feb58b19f46a680ede24047983",
+                        "r" : "0xbc46d930fd6713f1bfa7263ebd2f10422025a1573ad7a2671fbd6a1800b89f",
+                        "s" : "0x4ebafffff83d0af0d30fed6ae8b04280fc72aefce40f93ec4271f9d521828d3f",
                         "to" : "",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d2g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d2g0v0Filler.json
index 32a5a5837..0a5b8196c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d2g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d2g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160010d60006000f3",
+                        "data" : "0x600160016001600160016001600160010d60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xb77fac42d1f7bc109511b97e583432a6ba825256bfbc9b7ea5718ec446e77ec3",
-                        "s" : "0x2e95f3ac1c44a4f65a4d602edf91b62c48ed898f1f31b9b7bc48e66ef006af3e",
+                        "r" : "0x179e7a9bb1879dd736c4e934a7b46a95379a84e8bc648a4056be0ab324d712b0",
+                        "s" : "0x4a4c29e8b7093212438e177f868e62639dbb1dd0f148dd8a3bb6d33e0ae73fc3",
                         "to" : "",
-                        "v" : "0x1b",
+                        "v" : "0x1c",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d30g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d30g0v0Filler.json
index b309b5050..1fa81cb46 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d30g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d30g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160014a60006000f3",
+                        "data" : "0x600160016001600160016001600160014a60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xae67abd60b0222bf6b42dce993c167f8d97ead595ab432d70dd164ab8d4f2334",
-                        "s" : "0x6cf0db117e49cbb04fc66613cf6cbad112ea0acc409ea48b0b4b3315949181ba",
+                        "r" : "0x1e07b8023773861d3f494908b1b0fc3c6c200da1e1c1f35d435401c50e67d20a",
+                        "s" : "0x7feccb2c2d7ac573277f8938df522d9754fa3fd550219743b7aa7b5ceb9267a3",
                         "to" : "",
-                        "v" : "0x1c",
+                        "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d31g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d31g0v0Filler.json
index ced83bda8..923bdf623 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d31g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d31g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160014b60006000f3",
+                        "data" : "0x600160016001600160016001600160014b60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x7707c15772ce21bb43aa77ed1ef41f3a87e4aad1c6293cb6e5968c29dd247107",
-                        "s" : "0x4f36c85c7ebf0a646eb6f67b3956b08f27eed8cae83b5d3f5d6e85a0050171e4",
+                        "r" : "0xee1600cef549324fc4128a7220684070cdd1e1e19030fc558fc6f83b5f736371",
+                        "s" : "0x308003baf58fcf68d4b3c64099a94bdf50aab34f9569f1946b03dd2d6e386ed0",
                         "to" : "",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d32g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d32g0v0Filler.json
index fd9ab8906..3b8316923 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d32g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d32g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160014c60006000f3",
+                        "data" : "0x600160016001600160016001600160014c60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xc03a750bc502ec1e8767a376ed9d7da3473fc9f8ae699ef6287b7dd0b95a1a62",
-                        "s" : "0x51f49444dcf5fe6049ae91e25ac397f5048c38a7ffff621b51411f9f4b998df2",
+                        "r" : "0x629b78a0bca075a96ee1f384ee2e964625248c94bc4d23c6f43f081eb1c76792",
+                        "s" : "0x6d6e4350e522777c2252fc09e03b00b05ed5bed0b44ec97503f86b85433d59d9",
                         "to" : "",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d33g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d33g0v0Filler.json
index c252bb1bf..7e3acbacb 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d33g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d33g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160014d60006000f3",
+                        "data" : "0x600160016001600160016001600160014d60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xaf3afaf807ba622a492414eb6f9398337b152eec4bdd73f958ec7a0a2181a7b7",
-                        "s" : "0x24343b5491539aed57ae4495ee0abd304c72648736678b415e3b80ad52172837",
+                        "r" : "0xf81632462f061c0d96160369b179edc02a481bc34ca93b2dfdd5d20d8e6ac5eb",
+                        "s" : "0x41f17ab4d482b45c4ce45f58a2c3d9fbce6857f3163c86ab5194368aaaea71b6",
                         "to" : "",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d34g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d34g0v0Filler.json
index 2331a2bcc..261d57539 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d34g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d34g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160014e60006000f3",
+                        "data" : "0x600160016001600160016001600160014e60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x816651d4eeeba1a8515a3317748453285c2b662af6a66bf2848300099cff9d08",
-                        "s" : "0x7b8817f21e21fbe09badc4d470ab722aa51c655ff25ee3784b8f75702642713b",
+                        "r" : "0x6a38df470494190e150814c05df20c941b1e803ab5d4b27d932acde01d99465f",
+                        "s" : "0x1dcd9476bbff553229e33fc65a5af48576fab08b6b1c08969fe48f0817b5f45e",
                         "to" : "",
-                        "v" : "0x1b",
+                        "v" : "0x1c",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d35g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d35g0v0Filler.json
index 5116cd529..96edfa3af 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d35g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d35g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160014f60006000f3",
+                        "data" : "0x600160016001600160016001600160014f60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xd00d82adb90479b61f8f8c7eaa5ee90ce21ba0d99456cd0094912bc0c95e32f0",
-                        "s" : "0x56aa583bdbbe84d16046d58729eb7d6c8104cba2693eddc7d344d7d2e4feffd7",
+                        "r" : "0x0d9155cbec6cc074b4b330bc7fff1d76ac1ce74d60162ea04d2552b32f316d88",
+                        "s" : "0x699c04d517172217e76efa31864e078d54f3f1865045ba78f683a741d1b65a20",
                         "to" : "",
-                        "v" : "0x1b",
+                        "v" : "0x1c",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d36g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d36g0v0Filler.json
index 1c9b1b257..08e9257d0 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d36g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d36g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160015c60006000f3",
+                        "data" : "0x600160016001600160016001600160015c60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x31a4c9e8eff8edfc53f0134a4d3906efaed8984d44a4e7f115133072d592f294",
-                        "s" : "0x4e53053f3a5bfa491df5aabcd6c63bba47c548716f9f7196a001c40eafa3462e",
+                        "r" : "0x5a7624e60f496176db430dbfdec9de501d8da66d55e913869af094002a3d38bb",
+                        "s" : "0x799bce7a5845b866daca027dd3b3e8996b33e5d32bac38ae3e4eee0532a0cb08",
                         "to" : "",
-                        "v" : "0x1c",
+                        "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d37g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d37g0v0Filler.json
index 64167526a..f3756d36c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d37g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d37g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160015d60006000f3",
+                        "data" : "0x600160016001600160016001600160015d60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x7f63493058cd6da58d0a0e052c54f0b981aeadc2f427e9384695cb76a015141b",
-                        "s" : "0x6fef622975dcb02868fc8c6fe30ba8f7404bf93ad3aa081091a5e75c0912a7fc",
+                        "r" : "0x37675cb4cc2a9b71225d2a505c551d01110e217a63609538fbc47058593b7295",
+                        "s" : "0x380f283a212b31cd4a49ee26b69a34b52552510d4d34d351d8db55d9c460f253",
                         "to" : "",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d38g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d38g0v0Filler.json
index a21a50156..70850c560 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d38g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d38g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160015e60006000f3",
+                        "data" : "0x600160016001600160016001600160015e60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x8768c7ba1833a8c5d35365cc54d62b782640852debcf164b55fb989f2cbb7d4d",
-                        "s" : "0x0bbc9b9faa46a6028c16d93eae8bc8e2ee6465a1752090dd19ba73d1a6020ad8",
+                        "r" : "0x88f84feb27f9c48481c38a9fc3579e154b0e783fcbf3b33353ec388f0fd88b32",
+                        "s" : "0x5cb337a9392d8f67301bd86e3113d34b7f84bee520508a8ecab85f50a07e03ad",
                         "to" : "",
-                        "v" : "0x1c",
+                        "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d39g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d39g0v0Filler.json
index bea9e46ad..62e7ea3eb 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d39g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d39g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160015f60006000f3",
+                        "data" : "0x600160016001600160016001600160015f60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xc53d37c7f0618437cc0fc2db71cf10afac755d5d3853ac95fb4e4104fbb9adfa",
-                        "s" : "0x5ab3a27459390120b09b164316a4378ae80b39881ddf3c64b08ad6d54bdd2669",
+                        "r" : "0xa0979ce8c4de1524ba342e8e00fa73463c47a64fb3a2f7e717a80a333fbfab54",
+                        "s" : "0x37a0c60ed0e8094f0ab52b328d6728b0f6e49e3992318f56f0a691e8454f3600",
                         "to" : "",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d3g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d3g0v0Filler.json
index 83fc8206a..1bd31f63f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d3g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d3g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160010e60006000f3",
+                        "data" : "0x600160016001600160016001600160010e60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x8187a30d2fe1529e26e439c87856e60ec3071c7b7b140d1dce7e601e8230a527",
-                        "s" : "0x6e1eb425b211c5ade99a1c5246a0a871407967400e56531410569067ef29d178",
+                        "r" : "0xfac487f1d084cb0fb0508eff6c2206003e27f27b2aeddb91ead975858d50e693",
+                        "s" : "0x16b6f1fcb318c8023359b07de1a4491d1a33238c496c40be43e1d1d231b58103",
                         "to" : "",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d40g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d40g0v0Filler.json
index d27bfed66..ec3068f31 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d40g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d40g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001a560006000f3",
+                        "data" : "0x60016001600160016001600160016001a560006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x1d2e4482f421184b753573c68eed7b2f6c59b57ca61bbfa9d710b24b443f318b",
-                        "s" : "0x4063c1d2bdcbcff0b3ddc37bb05f7c99a9d3c13371e2c1fa2b044af9bdad82c7",
+                        "r" : "0x20fc02d07cafb5f3c2ee5e7756919052ca2f8ffcfcee890918c5430f025db1ca",
+                        "s" : "0x1588adb3a6127905cb78ce70a7ba0f6100593e547fc537d2178862f560af0496",
                         "to" : "",
-                        "v" : "0x1b",
+                        "v" : "0x1c",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d41g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d41g0v0Filler.json
index 8b416cfac..b0276f64c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d41g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d41g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001a660006000f3",
+                        "data" : "0x60016001600160016001600160016001a660006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x641569ca9ef3d5695bde9e9e09300b0a887316f3e0c6440365724506924fa166",
-                        "s" : "0x6c0f2ada289b0b669d87a5d4d59b1cccbabc85cc29d5f8130dd1a7af3a3b7afc",
+                        "r" : "0xf3a9030509b0fd93a6b3802ca25f6ac92db3f9e57614573d59ff79c7712140ce",
+                        "s" : "0x61b5170c10462ec329dab3bf1f2fcfbe4b09f5a9fae77b56a3d514db571a97c9",
                         "to" : "",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d42g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d42g0v0Filler.json
index 0af858f61..998c5607f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d42g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d42g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001a760006000f3",
+                        "data" : "0x60016001600160016001600160016001a760006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xb4c0865cce9875b2b48583ba5c2347592d6d9ee4847575a99f8dea4e972d8c2c",
-                        "s" : "0x4cc055fe63a1ab26b04f4d32c33bf6b7f9610ed8df381b9984454662d1f4837b",
+                        "r" : "0x419ffb0ad6368ed333d77eb692439edc3803ccc70f72777b2a234f3043cec932",
+                        "s" : "0x17e12201d54b1d8027c1513fadf2855f2f4995f800837e51f9b3ac0c172521be",
                         "to" : "",
-                        "v" : "0x1c",
+                        "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d43g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d43g0v0Filler.json
index 6f756fe8a..3ccfbeb2a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d43g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d43g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001a860006000f3",
+                        "data" : "0x60016001600160016001600160016001a860006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x5d1b1ab7dbc48cbeda730846a4be6634cc4b6444aadb13cffebd1e034cfdcdf2",
-                        "s" : "0x01a4badce657d9e5206229fd8cb57a3b9a1c03a147d5d4e08119ec2660a913ba",
+                        "r" : "0x09557434fbf39247920651c391c67f3b0d7dda80d771b6ab3b017539c6857701",
+                        "s" : "0x1ac582cae235655ffa97779619b5f7b62223d05d6bcf6f318a7fbff2c43aa5ce",
                         "to" : "",
-                        "v" : "0x1c",
+                        "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d44g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d44g0v0Filler.json
index f927da9a3..6c3709e5a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d44g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d44g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001a960006000f3",
+                        "data" : "0x60016001600160016001600160016001a960006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x09279a983c2334784ee6df5be335ff1cf5bc3cd63e00ea13f31692d0eea32167",
-                        "s" : "0x3c79eb0da099d84909b588b015b7bfdd06e7a0a6a3f55de6bc7048cfea0613d8",
+                        "r" : "0x12718d511d315372cf371eaf307a954a20be61a76e74c156508c60fb8ffcc434",
+                        "s" : "0x357a446395169f7d6dd9f26c7e54919b32a1827329915423dad870c85b6286cb",
                         "to" : "",
-                        "v" : "0x1b",
+                        "v" : "0x1c",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d45g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d45g0v0Filler.json
index 646c7ffb8..094f6a0ec 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d45g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d45g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001aa60006000f3",
+                        "data" : "0x60016001600160016001600160016001aa60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xc60410eea181faf7b1546b020d1e9979d655155f4242cb147d13b45df1810a56",
-                        "s" : "0x76a357e91e44ddb5134908e251e8857393aa2dd91da75eb2a0eb7c6afe46164a",
+                        "r" : "0xfad405b4e452957b48fc8653d1b0d137737dd6adc9ef4d9107002319843042c4",
+                        "s" : "0x1c7a9d796daf99a0ea2a8f6a0b1b227280042cb44e7405bdd0b3b1a5ce48245b",
                         "to" : "",
-                        "v" : "0x1c",
+                        "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d46g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d46g0v0Filler.json
index 4065785b4..f5653d414 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d46g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d46g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001ab60006000f3",
+                        "data" : "0x60016001600160016001600160016001ab60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x11f653a6015ebddf59587f036db136dc4d525680876764102b3c2aec0e547109",
-                        "s" : "0x655a6945545083699a2e19d42ecc2d119f68aee1a589ca802a4794a5404b9f36",
+                        "r" : "0x165033c8a5a8252bfdc480f5775aebdb3570a9b0609a89b1b350fc8cf0dd5065",
+                        "s" : "0x456d8fecf15c3cb84976c5ba4941d9f46c8a0255dad7042f6c3e8db171520f3d",
                         "to" : "",
-                        "v" : "0x1b",
+                        "v" : "0x1c",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d47g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d47g0v0Filler.json
index c7cb4cda3..a5da35917 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d47g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d47g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001ac60006000f3",
+                        "data" : "0x60016001600160016001600160016001ac60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xafe238e9ea73c953a2c4d4c807c94dfd9387a7b48b353d5b5d96830932a8821a",
-                        "s" : "0x0ee3f90e4b32cfdb989fbce2be888c33eb97dc878dad65030c4303f706c7e31e",
+                        "r" : "0x2fe8ba1754e996cece8ba04f31b7aafe0b2727f53e6ea14adc4bfa3717f8f684",
+                        "s" : "0x45758cb633bd8904e4b74fbb5b5a16eb4c10a711da39a978e4d596899afff82d",
                         "to" : "",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d48g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d48g0v0Filler.json
index be453bd01..a99a9d4b5 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d48g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d48g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001ad60006000f3",
+                        "data" : "0x60016001600160016001600160016001ad60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x0975a220d6480e9cfd390d0b174ba0fc54e4512d34840e7e463876c76fc2ae34",
-                        "s" : "0x20263434139f31f1d29aa68ed1973300bd4201e9d225655a608de00312f7de5a",
+                        "r" : "0x29814db5121eb46b615fe9cdf9a55a8b2b7ffd1a70840adf2c24e901bd998deb",
+                        "s" : "0x1620cc0279a00d64376bb599a2efe2935d90593412d82e5f0fbf03688d3a3a6f",
                         "to" : "",
-                        "v" : "0x1b",
+                        "v" : "0x1c",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d49g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d49g0v0Filler.json
index 61412587a..147ad715f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d49g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d49g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001ae60006000f3",
+                        "data" : "0x60016001600160016001600160016001ae60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xa47099e055170b4122618918e6338220f763286250a8385fab78f83fdbee032b",
-                        "s" : "0x3d6ef1be17828df43a7623bf5ed6532d1ed108ec4009ac03149e038d7790d95d",
+                        "r" : "0x641cad0db599c7ac6566d9f18581d48647d05b9e5970d444a13b20843530736f",
+                        "s" : "0x580a048c15880d5b98ff113600fc9b568b8ee9d78e89186206de2f1cc97b6161",
                         "to" : "",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d4g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d4g0v0Filler.json
index 18409df73..8ee1605e4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d4g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d4g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160010f60006000f3",
+                        "data" : "0x600160016001600160016001600160010f60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xc93bdd2e4aaa4589d9d074ef4b1e4c6c5187d5e3407a193e0f7e0083153734d5",
-                        "s" : "0x6cf9565af556d966ec5d57e93e38153c4cee9299c803198882a67da6068fcc1a",
+                        "r" : "0x02a3de0b4ee1b7ac0967a48e9f29e6853ec847ad165753cae58898f3d6a64f74",
+                        "s" : "0x5680fd17f51fb5db258aad8fb781aac283abc2217410f0c9bc04ece3e364848d",
                         "to" : "",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d50g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d50g0v0Filler.json
index 8ec7fda21..66b417db9 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d50g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d50g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001af60006000f3",
+                        "data" : "0x60016001600160016001600160016001af60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x553b16aada814e22d940168cb60fbd8003bb3251b34d2b11d4e567c2786b33c8",
-                        "s" : "0x5c07cb9860f3c94c4d7e494f0d258464ad5611001559535f51a494f7751487ee",
+                        "r" : "0xd9f9e0810bb59e0335b50ec18336cf750d36220f6342beb4da125548a92fe75d",
+                        "s" : "0x0d32c7f9e72d9e5be2d90e3aab011773a9852cab508080519ac41aa126dca0db",
                         "to" : "",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d51g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d51g0v0Filler.json
index 1a8c36199..4b7f80fa4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d51g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d51g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001b060006000f3",
+                        "data" : "0x60016001600160016001600160016001b060006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x5f7ca4a919651d8fb4497607bfb82102e64c57a56220ac6b2542b26ea0918b87",
-                        "s" : "0x7a72cbad3a62234cc20d06080ab6cd56c3a35b669ffc57a71e40aecdae33ab90",
+                        "r" : "0x3593998f87e63062aa84444e9cd70e22ed8b0b1e289763953ed7895cdee60a1a",
+                        "s" : "0x70b4d0fb7c90ba9750e9ebb23d3342f1f2d7991c1fb3a40cd14a0fed4b6bfde0",
                         "to" : "",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d52g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d52g0v0Filler.json
index 39c5e2c3f..ddd9614c8 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d52g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d52g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001b160006000f3",
+                        "data" : "0x60016001600160016001600160016001b160006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x5b4db5c0eabf650b8e647e32319c2b09b4223000d28432d1ce2606b5aac71b8a",
-                        "s" : "0x797eb04b434c245283002e7822e72750cf404e40ea94cc64ab97eb7378faafec",
+                        "r" : "0x97decd49706e2ff30819187e5a0cf8c849e21ebcdfd3235c22ec1a66d4659dd3",
+                        "s" : "0x2fef82e71d9b110cbdd9ef30d28ddc9f4e02f870ce5a44175a22dec1c910d29f",
                         "to" : "",
-                        "v" : "0x1c",
+                        "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d53g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d53g0v0Filler.json
index f54344dcb..9d57f8aa0 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d53g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d53g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001b260006000f3",
+                        "data" : "0x60016001600160016001600160016001b260006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x045357e907dcb340fa7e73520c29a17dfa1c9032834104396d03aea1132403cc",
-                        "s" : "0x36827cf836aa78875a16365155c8bad8af8a2db68cf78df627d9c85391ebe347",
+                        "r" : "0x3fbbbc15f097531522d84e7d053c077024c7e46f2e4c0fe17f04fb43594312c4",
+                        "s" : "0x56202ba208c32518e55cc7decd09d1c86e064bc936e8deb065920ca717f18719",
                         "to" : "",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d54g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d54g0v0Filler.json
index 33b395723..ec94869aa 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d54g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d54g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001b360006000f3",
+                        "data" : "0x60016001600160016001600160016001b360006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x642874187791dac6728f0667c0d7cfaa499e0bdca1253a39dbd356a5c0efd2a8",
-                        "s" : "0x5572453444788225a69b839f97d0694051be243d1e96ae655eea4f9a72e3706e",
+                        "r" : "0xea5f4e50be95ef4316ccf5ad28ca4f2fc6f729c3fc0127100767f5b501fdc76f",
+                        "s" : "0x3dd30c6fbfe3900b8398f99ee4239edb8b9b3104c378f3245af39a8067c3556b",
                         "to" : "",
-                        "v" : "0x1c",
+                        "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d55g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d55g0v0Filler.json
index 7e4f1ac6b..79ef071be 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d55g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d55g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001b460006000f3",
+                        "data" : "0x60016001600160016001600160016001b460006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x2c47f6a65fc9b30df6f3a872047d21148c163b3c437478ee8be5b703a8eb53f0",
-                        "s" : "0x3b01e0b61c9422ec88a442a4069d00adbd8fe142be92b5acc386653c24e46cad",
+                        "r" : "0x42b2d400def1ab5a29d50d1f95884592642d5651036bea4706a0181950f09e08",
+                        "s" : "0x115079c5bba996eddd73bd30277139718e1c40d70afccc7a09eff303ff4655af",
                         "to" : "",
-                        "v" : "0x1b",
+                        "v" : "0x1c",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d56g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d56g0v0Filler.json
index d8d500723..edaf692ae 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d56g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d56g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001b560006000f3",
+                        "data" : "0x60016001600160016001600160016001b560006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x5d49ce919dae03458f103ba64d782cabd4168414891c7583479a55bb616ff3a2",
-                        "s" : "0x744e8ca4cfb3c4842dac8c8a8db50ff09daf3a1ced9866d649a925b4a407c80f",
+                        "r" : "0xea08eb9e55be2fa1c322dfd34904aae0cab3389a4b657fcfbf577bb524873525",
+                        "s" : "0x1dfd28ce07dbb63f68ba40861859d2e56e156e99cf61f61703f29dfd4190fd9a",
                         "to" : "",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d57g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d57g0v0Filler.json
index 3a3da5add..f2751e70e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d57g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d57g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001b660006000f3",
+                        "data" : "0x60016001600160016001600160016001b660006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xc99843908df653d21750c8cdebe22bf70873dfce61aa25f986e071e42a9aff4e",
-                        "s" : "0x02d6b3b07570af87ba5d81260127c0399a9ba1d4e89a4e17c71671c84ed36fe0",
+                        "r" : "0xffd0c14cd7c81873d00b35ac0a9253d4e0c8a00c6575f795696d3d2dd0e7e441",
+                        "s" : "0x5f107284c57e3c7a7ffcee730bc211bb78b1df0d1051b6f8c48524a4535d0f48",
                         "to" : "",
-                        "v" : "0x1c",
+                        "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d58g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d58g0v0Filler.json
index 3a9d49b3c..c793fc841 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d58g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d58g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001b760006000f3",
+                        "data" : "0x60016001600160016001600160016001b760006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x79593221f53d50fe3ea8a2df817cb06375a53a0dd40e40ff0ada293efcc999d0",
-                        "s" : "0x5569e43cf30edb1aa7c3c04aee4c3300d3008d785d9a21ca141005e9ed6cd6a9",
+                        "r" : "0x0421edd3b360e87cf5c62721ff21d8130346a71b92560766b2fb8fbf3c86dd17",
+                        "s" : "0x3ff2e175d90c691afa4c2c0cf61dc5699345b017d70dfab36677125759e63dbc",
                         "to" : "",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d59g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d59g0v0Filler.json
index d0383c431..92884fc93 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d59g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d59g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001b860006000f3",
+                        "data" : "0x60016001600160016001600160016001b860006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x66311ab5933df4d9776936fd580e6671dbd105b3ad5d7fff9e48fc1e313e3aef",
-                        "s" : "0x5f3794d32ce317155e38c2869649f3c5ad67311fc6cb3cd16b1dc2b51eb7b772",
+                        "r" : "0xae847e11f40b4722e22cade39552b7db8d382bd479dcd2407226fbcef8352c5a",
+                        "s" : "0x3b61707079abf7b26119c13b934e5943be09faaacf0244f31327e825c73999fa",
                         "to" : "",
-                        "v" : "0x1c",
+                        "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d5g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d5g0v0Filler.json
index deff906fa..479bec017 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d5g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d5g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160011b60006000f3",
+                        "data" : "0x600160016001600160016001600160011b60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xcb2282ff81213340f072f4cbab9c33c9ca6ae63b4df0eee7fb84f9dd8af44f3e",
-                        "s" : "0x350edf5d5658428c514a36a3a0e7c515f68dda6ca4c81850f1c96b6189f86ce3",
+                        "r" : "0x4acb644426a825d317e5dd4f4b6fb8b415418032d3b0fa90a527cda89c2ae8c7",
+                        "s" : "0x092f0a183660394a5d5c2a94681dbdd9dff9784f7e7d0edaa6b43408a63c89a6",
                         "to" : "",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d60g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d60g0v0Filler.json
index 7a865c577..480451521 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d60g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d60g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001b960006000f3",
+                        "data" : "0x60016001600160016001600160016001b960006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x105c6363ffff5a787616da902b89ee96bfa4151d5b49f6d51af696a9bf965a0f",
-                        "s" : "0x47ecf4dc911527ce61bb3e4576f483d086b0929302758c9963d75314e40c182f",
+                        "r" : "0x864dd2d491dc3d16eba1ef56a7b4c135262e4d2c2c0a9981e36183209094722e",
+                        "s" : "0x2fd4fc2aceccb1ccce094d16feb021372c25aeb571f555fc8009450964343bba",
                         "to" : "",
-                        "v" : "0x1c",
+                        "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d61g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d61g0v0Filler.json
index 7fc66e643..e2d2bcd69 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d61g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d61g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001ba60006000f3",
+                        "data" : "0x60016001600160016001600160016001ba60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x945a7ba55c82f23b9d620d37efdc1dda0b5eee510dd7f26bf644cbccf76659f1",
-                        "s" : "0x16172b0de7ae9ce7d03304b0180f6517eed5f35ca1bb9ef145b652c0d4b15d83",
+                        "r" : "0x4a63e5e42abcb58f07093440f47e5c0c67c1abd8309bde3b772f1c32ec5fd6ab",
+                        "s" : "0x2f8bb436ee89f256458081498c9a9c2c3247e822fcc916d400361d3345a7b3ad",
                         "to" : "",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d62g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d62g0v0Filler.json
index 5726554a8..25c6e0354 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d62g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d62g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001bb60006000f3",
+                        "data" : "0x60016001600160016001600160016001bb60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x49957751c294a771af1ecc5b6471da099523e792c1df43175182aee892c65d2c",
-                        "s" : "0x64dc8e5ff78f37d3e21ae9adaafa6f797066de0941d44f57829a8258c5020b78",
+                        "r" : "0x4a51fc39abc0ab455faf822033e44b1e111656bf0d20afaeeaea8f8d0f6c9fb8",
+                        "s" : "0x3e8ba53ed5181e31dad858a29a9b3fc2f0c2f515289ae7b76566ebcacfd9c091",
                         "to" : "",
-                        "v" : "0x1c",
+                        "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d63g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d63g0v0Filler.json
index 2bf381d86..284c2c881 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d63g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d63g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001bc60006000f3",
+                        "data" : "0x60016001600160016001600160016001bc60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x975502462f6bee7e8c62780314550173e57c7782c5047cea54cb1c94056fe9d5",
-                        "s" : "0x58f6771ecc528c7fc07c8178e10ba565ae15aab05fbca08040d67ee7f7102b5c",
+                        "r" : "0x044d2512d3348514652af6cfa506359592e354fd63501d9cb24a12de7e2b7035",
+                        "s" : "0x0ef42c483d2a2a482625dc6e458f274a74064fa9d7c192c509c5fcaec9f66d1a",
                         "to" : "",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d64g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d64g0v0Filler.json
index c2e9ad633..8e8b6d729 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d64g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d64g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001bd60006000f3",
+                        "data" : "0x60016001600160016001600160016001bd60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x7029e68b814eb1c03231b04d9d8acd5789dc9471dbcff585757713843810c017",
-                        "s" : "0x3ee4e8bc52df9a192f0035dfa906598e329fb35bab0796ca55f8fe82f940db19",
+                        "r" : "0xf1a3a0e16cb5dd7d7cec32185d34995f0a368a67d2505bfe68d797c994d421c0",
+                        "s" : "0x69f12450ff8314bef3dafded415d76fc1fa2149dd47b02feda8d73cab6b7ad2c",
                         "to" : "",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d65g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d65g0v0Filler.json
index a397b1842..a02f49cb5 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d65g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d65g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001be60006000f3",
+                        "data" : "0x60016001600160016001600160016001be60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x08ee70ff4a04dbd25330e0e3d4d86548e6c282beb36a0689d1e1aed375a20b14",
-                        "s" : "0x43e066a9a101532a0bd0d580f408e0ac65d511e5e3033fb065ae7090c1a9bad5",
+                        "r" : "0x156b75d949f941cceb7573ef1a761e67aaf1928ea303cdfb55d8ff4819512ab3",
+                        "s" : "0x21a8ccc725de66ef4bc2a2a53584a3c648608ae1718561fb6287848479486524",
                         "to" : "",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d66g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d66g0v0Filler.json
index 6e1dadaf3..2878731c9 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d66g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d66g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001bf60006000f3",
+                        "data" : "0x60016001600160016001600160016001bf60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x7e6882137767e5b6ca53bf8988d1396aa7391169cfd5e342d66186855c8f58ca",
-                        "s" : "0x1a671fada4489c8713d9872ac8561e34ba3474152a31a9a2d518fb355269a8f7",
+                        "r" : "0x1298d04de6a6f432e936801e3abc0b3e9c368be876cd6f3ae1bf17fea6d5fc98",
+                        "s" : "0x343ced372c64c244c7e9f0eebf3dcc9d18bbe62cb65c0da5c8dd8fe5099bdcd1",
                         "to" : "",
-                        "v" : "0x1c",
+                        "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d67g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d67g0v0Filler.json
index 2b0c121e5..be0f6a43b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d67g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d67g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001c060006000f3",
+                        "data" : "0x60016001600160016001600160016001c060006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x50c2466712167fd00853f2e08183712e773fc679e02a09b0fdf78ba362da1dc6",
-                        "s" : "0x35fe6a94ec36a6f5519fb74d859869ea86a9d74dca534dbc012b5c8df6ab6feb",
+                        "r" : "0x7187bfbe5202285c156e95afaa8dd9567e97056beb9c1206001aeeda5cc9c760",
+                        "s" : "0x3ac67d1ba22bef40283210a3d02663b9afa684af2cac47b84ccead83f308d6db",
                         "to" : "",
-                        "v" : "0x1b",
+                        "v" : "0x1c",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d68g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d68g0v0Filler.json
index 404093915..3c2d3a1c3 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d68g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d68g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001c160006000f3",
+                        "data" : "0x60016001600160016001600160016001c160006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xef7ad81f7282d2fa29e2c588695d47fb515c3652edb86e3bf63bbf566aa9aaac",
-                        "s" : "0x1f20e70816fec2379b8778f4de9db208e13b6b2b0fbcacab54f734af434c9e96",
+                        "r" : "0x7ea93b27382368e50877fe1ef6a9bd460dd73d762221d740ba28b8495461f428",
+                        "s" : "0x3f997a790cf5c426f720a58db5667d4971519827956655a086bb7a07470ee5d0",
                         "to" : "",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d69g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d69g0v0Filler.json
index 6ef2db10a..6a7fce74f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d69g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d69g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001c260006000f3",
+                        "data" : "0x60016001600160016001600160016001c260006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x690986f36e1e70772cf3d5748b155511370ad7c8e506775fd2c118cf98a4336a",
-                        "s" : "0x55843bf27ad2b44af8456db8bfa6486dda0498351e42a02f5e53d0b0633ecac1",
+                        "r" : "0x59d81ca07a8fb0597c989e3cb54d0de915fed2d6c86c6d546e65dc66a7ed667a",
+                        "s" : "0x220c712a755a8a263223eb9a0f9e536ee826ec1c7c01dafcbd3af2540a0170c5",
                         "to" : "",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d6g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d6g0v0Filler.json
index 46ce73267..2518b7d19 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d6g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d6g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160011c60006000f3",
+                        "data" : "0x600160016001600160016001600160011c60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xa737086e9ec590a2a6e35bce735d9443aa46c29fe3d98ca17653825aa0ed78b9",
-                        "s" : "0x679242195863c0f72cc4a9174baa84316a1f8b87ea3595596c2c2c7fd431413d",
+                        "r" : "0x445a65f216559855cad32ec2ba44fdacd5dbf21132f465ba73131840e9d09359",
+                        "s" : "0x4ef370b89561f50f1f9e6a1abc25fd078b5f58c4dffa077f339dc74a2317fa06",
                         "to" : "",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d70g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d70g0v0Filler.json
index 5ad94e900..62767bd94 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d70g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d70g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001c360006000f3",
+                        "data" : "0x60016001600160016001600160016001c360006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x3ad7cfa235e9912bb045ee5eaa8d0945e6c89c036be7e09eccf198edfd1bb19c",
-                        "s" : "0x02f7bf9a313245d0bb8cf92c6b60379f5b93da04bfa8067e1aac9ec935cc2ba8",
+                        "r" : "0xc7365d320144c7fe153c33227f55abe731f73f35221af67446a0eeb87469245e",
+                        "s" : "0x255b6eaa08589134277bbec1c03c4f2b04866a979232e60985f662b3f2b26cee",
                         "to" : "",
-                        "v" : "0x1c",
+                        "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d71g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d71g0v0Filler.json
index fe8a6ee8c..8eca465ee 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d71g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d71g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001c460006000f3",
+                        "data" : "0x60016001600160016001600160016001c460006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x64a85602d862a8f53d0ab70283e320bf46020e37075495e5340cbfa192827d9c",
-                        "s" : "0x38fd6c7d6e47ff7955412186aaf1906cc8bf3caf3962c35085315450c63e9607",
+                        "r" : "0x305cc84fe53ba2fbe8d169c1b7e42f415c81c9fbe90a2668f2573f75c5f4454e",
+                        "s" : "0x7e8fba95de5a3d67a5c9a97eeab1efd0395c0b588b590b5080a43076c3567972",
                         "to" : "",
-                        "v" : "0x1c",
+                        "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d72g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d72g0v0Filler.json
index a83bf9eb8..9d579f200 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d72g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d72g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001c560006000f3",
+                        "data" : "0x60016001600160016001600160016001c560006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xf527aa491b8acf3d37aa0c515a14175aab7d1908a77f1a6c0267b377b0df7ffa",
-                        "s" : "0x74d1e0eff918592a1b1cc1b64bce1feb1524eb27f9ee2dd0a5232d88f28ab21c",
+                        "r" : "0xcdfce909aecf14ac18a33590e818672229411a78a3f733a018a8f3db223d2378",
+                        "s" : "0x48641e22f8b85a5ce4092c96581de5161b9622add7a69aa7988f10d8be50ba7a",
                         "to" : "",
-                        "v" : "0x1c",
+                        "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d73g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d73g0v0Filler.json
index d4a46dec7..3d31f4711 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d73g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d73g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001c660006000f3",
+                        "data" : "0x60016001600160016001600160016001c660006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x7541578a325ebfa49ffbb82b3e8626e1dd6929b4a8dd94dc6d3140963086fbca",
-                        "s" : "0x2c8b41275353f93103d4e93a680b033291f2e595c99ddc88b85b201109ebc817",
+                        "r" : "0x9c3a60bf0791b83bb6a0e5fcb3d2680d82bc43860b9aaa00aed63f06101c5e91",
+                        "s" : "0x49012c96793fd9245cd498b31e909ea1ed54934bda54d27fde4e83d7bae06475",
                         "to" : "",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d74g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d74g0v0Filler.json
index 47af2811c..fe6bd26f3 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d74g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d74g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001c760006000f3",
+                        "data" : "0x60016001600160016001600160016001c760006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xd41de0d48d059c2aafa57f4731e0c24c423215dcc27eb6b21e6662ffe6879469",
-                        "s" : "0x0ec9755ceaf064066523be0c18532921a7079bcfc5732321c1d7026305603430",
+                        "r" : "0xb26a9558815e34dc6b56662ac3ca964e0f75890d3c596a3e4258341f75aa12f0",
+                        "s" : "0x410cedea8af6a9a345238e45668b4685307d62e5ab230674128e29a2696179bc",
                         "to" : "",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d75g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d75g0v0Filler.json
index 2a3e1b619..32fc2eef1 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d75g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d75g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001c860006000f3",
+                        "data" : "0x60016001600160016001600160016001c860006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xb4ae2285c17b86ca73774851352d1357e6675d9446d3af2645a8f51b58656de8",
-                        "s" : "0x47fc56bdc06161442f3384f48da3e43b3ebeabd5900fc419784d7cd27243c5e4",
+                        "r" : "0xc4e1e6f5ae1bae87d3f97ddb46b3c87420dee3a7a772e89b7ebbdba521a6946a",
+                        "s" : "0x69f45d8484d0c62b3f617d178c0f25ea45ace33fb55e032049e4a6e370554978",
                         "to" : "",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d76g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d76g0v0Filler.json
index fd56a9702..7b5b325ed 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d76g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d76g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001c960006000f3",
+                        "data" : "0x60016001600160016001600160016001c960006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xbace33cd4f6d3a2cd2f41c60450f666ac91c5f5ab8bf9e39326a7ac531e593cc",
-                        "s" : "0x1db1f5f5bc35b083fe191b995575eb4d1d0f3693c4d5204418a2c2a655a87036",
+                        "r" : "0x21c38b1e6424ab4ec448186a226adc33fdbcd35952141671ea228d728c2441f2",
+                        "s" : "0x26080f81151a9a8a9e9080576e82f6f2677ffbe660a69610c690cc9f30298577",
                         "to" : "",
-                        "v" : "0x1c",
+                        "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d77g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d77g0v0Filler.json
index c7cdad563..959a4357c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d77g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d77g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001ca60006000f3",
+                        "data" : "0x60016001600160016001600160016001ca60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x4cdf888b0e4f19fb09914d17acef1367705fc01f191db46f22fb9d61878b6baa",
-                        "s" : "0xe44664cb17da1698940815b941052829139390030246391dc2b1d647df4105",
+                        "r" : "0x7dc5f7383a56e91f591129db3baa6b6348b2a6f47fb94bc3753bca1389510c5c",
+                        "s" : "0x5ae6c45f474361af881693f1fb4e583df4252e0da835c90aa3ee71f62cead5d5",
                         "to" : "",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d78g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d78g0v0Filler.json
index beaf4494f..cc7251281 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d78g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d78g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001cb60006000f3",
+                        "data" : "0x60016001600160016001600160016001cb60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x0ea45b7193cf3883a52ef23b738b3d63b86c779a61733d574247085c9fae623f",
-                        "s" : "0x0599541998134a9f7826d802697481eb1ee3a84ac10c7171ac6ccf138f1ba801",
+                        "r" : "0x8d078e056b83d07f57f5caf984097ebd6a1157d60166be4fd0264f13f403a01b",
+                        "s" : "0x1589b7e0a3cfd83034036cb16ee9b2cc556423fb55da549af507f960418ed165",
                         "to" : "",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d79g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d79g0v0Filler.json
index aeac4eeb0..10a68db27 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d79g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d79g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001cc60006000f3",
+                        "data" : "0x60016001600160016001600160016001cc60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x1ea556782e822d952adfd0673b8a762de2e392c0d5bde1da36b9fbd43bc5a10a",
-                        "s" : "0x784746c90ec2af02c017a4e74719396b902c88a01e6722a53fd05949758511ef",
+                        "r" : "0x1a85a015bd71d235e7f5994a55bc0608bba8d84e4f92ec2427aa154ae6d56f3a",
+                        "s" : "0x3ea0d7e2ad8684b962fe56eb34a1b1611e595ccc67f9f65118d72a56ef4c8308",
                         "to" : "",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d7g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d7g0v0Filler.json
index 3d5e608a9..1fbd6249d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d7g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d7g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160011d60006000f3",
+                        "data" : "0x600160016001600160016001600160011d60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x753878a75f4a83594c645e28a6e9c606317a151664d093fcc29ae2d38ae416ad",
-                        "s" : "0x070c98471cc33404b7cb47857e4c02cc7b2eb8511d8d920539943e10151edf97",
+                        "r" : "0x6d3c8a211208c7328750199e0e99d63ce97f9a7b71aa6c788f25fef5806197f3",
+                        "s" : "0x1abaa5c950b20bcbee150e2c3f788d2f8a7d398c90dadaf41bc19f852bc3be92",
                         "to" : "",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d80g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d80g0v0Filler.json
index 1f273a05c..ec5d48b7b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d80g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d80g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001cd60006000f3",
+                        "data" : "0x60016001600160016001600160016001cd60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xed96f91a81e46bacc8ff38e143f1ca7330d312d2e2e4672668061adb43281c84",
-                        "s" : "0x283e3a93f8165458ebc691a6eac751945a37012713b3c2acf201713ec75d7f67",
+                        "r" : "0xab395c52134722cd6438e6778e02b63e6175f3805a532ad57198c47f624ed496",
+                        "s" : "0x59ed55e886533e6fbcbd7b519e1fc1901d5439c74876ab5421df22b641cb4c8f",
                         "to" : "",
-                        "v" : "0x1b",
+                        "v" : "0x1c",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d81g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d81g0v0Filler.json
index 3d8f97476..6ef9017e8 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d81g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d81g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001ce60006000f3",
+                        "data" : "0x60016001600160016001600160016001ce60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xa9eaa3907f73c9f57276ac7dee248587e9367d80bc557068e3bdeda599ad4c65",
-                        "s" : "0x5896a939dc7ba0e3f631b62625be0f5fc42bc60d5cf80c193f2da8a5c4ad0819",
+                        "r" : "0x877642ddcffc9639b517dd53414b0aa9c896d4eea65811ed5a0a77b400a0c236",
+                        "s" : "0x69075e6c6b2dc4d6d87f33d81e608ffedf3217419d27eb766b0b7abcf2970fc1",
                         "to" : "",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d82g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d82g0v0Filler.json
index 454a0c2fa..bd0d4c9db 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d82g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d82g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001cf60006000f3",
+                        "data" : "0x60016001600160016001600160016001cf60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x441c4d28801e9f2fc402a4b1aa9503f6e8170e77e3be742fb1c2fce19b0203d8",
-                        "s" : "0x2b0c38d8dc590e8cfd6de64ad59a0bfd0c5c65a567096e5b414fe29c565b1a08",
+                        "r" : "0x539d42e546c4fc15b5ef68cf621447f907a80b07fc4cda5a7484c9833786e4b5",
+                        "s" : "0x4d0a0766d3d7591638fd571e273e7a4e61fb7b045c519de040bfc7d5470e0284",
                         "to" : "",
-                        "v" : "0x1c",
+                        "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d83g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d83g0v0Filler.json
index 52c40b043..9a047c013 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d83g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d83g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001d060006000f3",
+                        "data" : "0x60016001600160016001600160016001d060006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xad002cce0a9209a53561911c25ce4724801988d22354415bc52b1ed6ddcc4068",
-                        "s" : "0x1316ea59b3906b350834b3bd262fa559eee40d07e60b4f8e7ee3827009cf9760",
+                        "r" : "0xc5ca013b69b3acc5aac9f485d04d938713e48ccf3f496d4eec6bcb269a0124d9",
+                        "s" : "0x4fcf74a346141289c0ae101a9605d4695adb89e226cd4fb091c5554ffe3fc697",
                         "to" : "",
-                        "v" : "0x1c",
+                        "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d84g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d84g0v0Filler.json
index 9d24e4687..759883828 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d84g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d84g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001d160006000f3",
+                        "data" : "0x60016001600160016001600160016001d160006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x984919476471f10319fd9aec1f082b6e75f23341b8d0c8bb080f7db6dbd4f383",
-                        "s" : "0x02c840f36fd22972e578b1b7250c57897f3ed999b32553ad489ce8ec96a92a8c",
+                        "r" : "0x4048fd1451af6f74a3eb7067e82eff33e94a89f26ebab0119d93caf3d8d698f3",
+                        "s" : "0x43a8550f7451f2f5a0f5d3e35c0a68dd1d594558096974780d69141877e3b3b4",
                         "to" : "",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d85g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d85g0v0Filler.json
index 242a2497a..96ea267af 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d85g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d85g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001d260006000f3",
+                        "data" : "0x60016001600160016001600160016001d260006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xe3b667568cff4181baeb6fc8709445b2a215d81c9830bd1415b164a649a41535",
-                        "s" : "0x7b403a0993cb71c57b3e4b94ce9b5d7c5275dfaf06fd5a4c09dad2c5abf0f353",
+                        "r" : "0xe1391be87482852ac78dedf8da808fea2210a375273803457739a9f057f07c29",
+                        "s" : "0x4e41abc096a1ab4e9bd6c4725c2208ab05288d796f569cc23a95664362826dfa",
                         "to" : "",
-                        "v" : "0x1b",
+                        "v" : "0x1c",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d86g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d86g0v0Filler.json
index 45681f142..40b67c629 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d86g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d86g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001d360006000f3",
+                        "data" : "0x60016001600160016001600160016001d360006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x1b4c4ffcf50bce81654584ec9c069014c3bf907e5c145d148241ffe7cb209c99",
-                        "s" : "0x27695dafa56907c7379897709e5fa8f75ac2d73415f514bcfaff93dae565afa9",
+                        "r" : "0x023eef03b5dc0a9125f916b13f551894204cf03d0d1092a6add2b0b50c0c81b6",
+                        "s" : "0x63a399e23679d83abe1b5f82ae86d803eb7032c19a2b4dd3853c31483ccc793a",
                         "to" : "",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d87g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d87g0v0Filler.json
index 4e8e902df..585361f7c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d87g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d87g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001d460006000f3",
+                        "data" : "0x60016001600160016001600160016001d460006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x314f91215c20150f26f9cbb582f232664763bfc5aab4efacaa81569591096d60",
-                        "s" : "0x432c4dc50f3c7a1ba41c30de66529c2c08a1a8b61b0e568fe912a7d9e0919d0a",
+                        "r" : "0xbd7f2e0c2093625cda0d7350daa997d152197d6b4438a8dcdd96b830efc3a828",
+                        "s" : "0x6f9c502c22942b0395ed6fd23dc87c944f4e5207558d892a9efeb039bbe7f0a3",
                         "to" : "",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d88g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d88g0v0Filler.json
index b0a496d87..ea73281a5 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d88g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d88g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001d560006000f3",
+                        "data" : "0x60016001600160016001600160016001d560006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x6291260e76fd79081f5afce8dc5439da88d80a3fbeaddaf51eb0f0066490c195",
-                        "s" : "0x589af8b272408ea925caea8d5ad7f4b06e400956ab62650dd1ddfeb5263dddf7",
+                        "r" : "0x91ed1c8b4c329baaf5676673eff6a39982d9eb4727c22734f2a0afe584b86ca7",
+                        "s" : "0x54ee5b0c6bba34350d9f935bd62b2811539e9c5e4ba2f5b07c10ae28fbd84f7c",
                         "to" : "",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d89g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d89g0v0Filler.json
index 806daf44e..bcc315832 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d89g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d89g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001d660006000f3",
+                        "data" : "0x60016001600160016001600160016001d660006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xb569d1160bf3b97c8e2da4ecc237ea46ae1b6c283d7b9e84817b2b42f74a0a10",
-                        "s" : "0x69a55f62c37fa94722806bf71dac1c2117e61531c0cc09da78bd45a29b5cabef",
+                        "r" : "0xae000bff865f86de12e41c4f5c8c111bc1869349ca28b407141ebbd45e29bf9d",
+                        "s" : "0x6efe329c288ad318fb3a26fc426c9794a392870fadaea161132d502e456353cf",
                         "to" : "",
-                        "v" : "0x1c",
+                        "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d8g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d8g0v0Filler.json
index 104a164d7..c7a0c7b23 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d8g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d8g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160011e60006000f3",
+                        "data" : "0x600160016001600160016001600160011e60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xb121b0dc86189b9943c9216737a37606072d4bcda2a9525489dfc75f6fac3188",
-                        "s" : "0x67b7b18f08fe8cee18bdb11f3eee3734aac9df87c13144021d6e671b1b896306",
+                        "r" : "0x19d7f91f980471ba307814f87438c606f9a95f68497104b5aee29752bcf569de",
+                        "s" : "0x0efcbb645790340ebd99dff475489571ba87bcf75776900e37bce2c88fa42b6c",
                         "to" : "",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d90g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d90g0v0Filler.json
index dd6873e57..feef8e6ec 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d90g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d90g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001d760006000f3",
+                        "data" : "0x60016001600160016001600160016001d760006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xbeaed1ca78a6da33b37c9027c7594f87bb58ef998e01bc9fc76db6eb6dade397",
-                        "s" : "0x55a37f6aa696044c8cbccebcf538e9a18159170db88d3d0acb3f8d12d5b5429d",
+                        "r" : "0x67d0afce052f1eeac0e811b3f934379307a13c0357ecf8539b08a773b7a4fb7d",
+                        "s" : "0x498f6279ff89443793eb88e2126bf387549d185f54ea74002d274fa4cf668b3c",
                         "to" : "",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d91g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d91g0v0Filler.json
index 934707b92..721f2ddc9 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d91g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d91g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001d860006000f3",
+                        "data" : "0x60016001600160016001600160016001d860006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xa8f8766d71858fad01b78f371a4b33cb82bc00e6b3a40acef8fb36b67a95fa8c",
-                        "s" : "0x3d90b6e3217fc36ea752f924f1f9e521733d7737de99a62a28f3a551fe3f7103",
+                        "r" : "0x1b3346202e810fa58e8a90e5bdc534f0c0079f475f749c5635d5d21bfd043085",
+                        "s" : "0x3033dcccd8c063ba9fa1ab58f96fae3bb47b91f17a22dc7613b33c7a31337573",
                         "to" : "",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d92g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d92g0v0Filler.json
index 2fa4c2991..eb1804d2a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d92g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d92g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001d960006000f3",
+                        "data" : "0x60016001600160016001600160016001d960006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xc5924878d9f8dd2328fa44a3b31716370fa4ad76a1f54873362d0f30edf983f8",
-                        "s" : "0x30ef95a170a6af6895a4f8c1102b200c1ec3d828ef9ceb81326a14b3debefb4d",
+                        "r" : "0xf30d3ea61ffe23148eb4a00cfe2850f32215f99fde2cf295f7f7aaa88ab01d00",
+                        "s" : "0x11a0161d02edab96e019da7d907121ed796e82f53c7b53aabdd50aabb8f4469c",
                         "to" : "",
-                        "v" : "0x1b",
+                        "v" : "0x1c",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d93g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d93g0v0Filler.json
index e14cce4eb..5190f7891 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d93g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d93g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001da60006000f3",
+                        "data" : "0x60016001600160016001600160016001da60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xbae83122bc355c600bd2ce932cf0aafe5925f505342720433de58cf7c0cfa884",
-                        "s" : "0x74886d9bfc245b99f73b40f866e8fbbfba01b6762ac798d8aae2f97679e96ef3",
+                        "r" : "0xe8d68eb5d164467dad6764227c6fe70822185ea563346d00a3a01bcf03bed2e3",
+                        "s" : "0x136d569b7ad6fe465b5417f7197a6745f21ed32603798916e13d029480ced905",
                         "to" : "",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d94g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d94g0v0Filler.json
index 649f3978d..138b68161 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d94g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d94g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001db60006000f3",
+                        "data" : "0x60016001600160016001600160016001db60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x155f6ae3dc1f9eb0c60730f0e955f6bcdb0755784789ece53f0f97fd397aea34",
-                        "s" : "0x77eaa75ded6ff4de3c8f600a4e075bcd368be2d231f9aa6c32d50ea4a3c6441b",
+                        "r" : "0x9835e17add83e1863b1267235d744dcee9997fbef5c878916d679b1c8a7b66fe",
+                        "s" : "0x056b9f3d1f357f688722168ba4a124c03bd62d7616e485a66592ddf163e7955a",
                         "to" : "",
-                        "v" : "0x1b",
+                        "v" : "0x1c",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d95g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d95g0v0Filler.json
index f746a3272..791049a05 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d95g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d95g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001dc60006000f3",
+                        "data" : "0x60016001600160016001600160016001dc60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x20b79a79894877ac1ef711bddd069674e4e12ebd53249c102d6a17c98cca2e57",
-                        "s" : "0x5b0a044d2e4be73155b7ed5cbd9d37754a1b0ce27d45f2b79aef1ab4c4cd718f",
+                        "r" : "0x1ebba00d0208b3825aecff8fb818c39e7d4273136e057ca1f368440305c8f12b",
+                        "s" : "0x157bd42a0c77e92fee3c1fa6b3cacb6fc500239e83c60be109b782ceb5712c01",
                         "to" : "",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d96g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d96g0v0Filler.json
index ca40ecfcf..74d3591e8 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d96g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d96g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001dd60006000f3",
+                        "data" : "0x60016001600160016001600160016001dd60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xa61b84fd98b229fbba46dcac86c4f2ea6b6b1e68414c493de7ea9d19d9e37a7a",
-                        "s" : "0x3029b046b70f692754a868207b875905c4eddf7b0327f9e9a9d06e640d252c7e",
+                        "r" : "0xfc1dff839acd65843a67a8ec42e7f5d46b20e3c074faf4b673619307ece4118a",
+                        "s" : "0x58875fe213273225c88df09cfadb24bf617131635bee521dbf41850d2192aa96",
                         "to" : "",
-                        "v" : "0x1c",
+                        "v" : "0x1b",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d97g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d97g0v0Filler.json
index 3edf2fea6..442ab098a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d97g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d97g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001de60006000f3",
+                        "data" : "0x60016001600160016001600160016001de60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x54a0b4995853fdc66852ebb4d8a0f6a6599dab1438d71edc17757c90cec3ddeb",
-                        "s" : "0x1d7f1c7ef61f21e27909b0e693723ba66c404051dd05a9b981429280574674e2",
+                        "r" : "0x1e739bdace21abbc9cd220652c0f57296836a8d315ea7dfbfefbc239a19ef3ca",
+                        "s" : "0x53af0ee39e4a4335fdc9aebf9dec618bbd455c47117f0f4fa8324b6efa6d1655",
                         "to" : "",
                         "v" : "0x1b",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d98g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d98g0v0Filler.json
index 0480a2ca4..d1a76599f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d98g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d98g0v0Filler.json
@@ -10,14 +10,14 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001df60006000f3",
+                        "data" : "0x60016001600160016001600160016001df60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0x56fffaa6e4d07df30910b2fd98f1e8eb7ce515b903df14914c5c3e61fdc0498d",
-                        "s" : "0x525616a18e9e108c016cbda0668a575c66cb39d3bc7a32aef739b71f4eb5d837",
+                        "r" : "0x522fbefed94ccc9b7290866bb05fe1195e0d60f164b1dc9dc8adaac7cd3541c3",
+                        "s" : "0x19a49a041488f700169922118cbcbf9e272b75d98a56c80acf89eda70956ab2b",
                         "to" : "",
-                        "v" : "0x1b",
+                        "v" : "0x1c",
                         "value" : "0x0186a0"
                     }
                 ],
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d99g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d99g0v0Filler.json
index f4e1cb633..1fd1df918 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d99g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d99g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x6001600160016001e060006000f3",
+                        "data" : "0x60016001600160016001600160016001e060006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xf0ff79ecb1b7a29dd5c932095c3613ee72001ac4cc7d96ac3d94bb75b2339ae6",
-                        "s" : "0x76ab36997c03ba6fbe7fa96f001ff73dd42b8c0f5e1a92ad52a482add0605942",
+                        "r" : "0xc92cf6c7c113abafb795469f2300cd4ad89eaa69c2165ee20d1f8a2b1180569a",
+                        "s" : "0x11f270aa4a6033a54fed02209d191c3ca3e264f5d0b9eb341d579832b47881a3",
                         "to" : "",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d9g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d9g0v0Filler.json
index 8888a6f5a..52d5ea95b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d9g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stBadOpcode/badOpcodes_d9g0v0Filler.json
@@ -10,12 +10,12 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "0x60016001600160011f60006000f3",
+                        "data" : "0x600160016001600160016001600160011f60006000f3",
                         "gasLimit" : "0x061a80",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
-                        "r" : "0xec8c10c5f120385e4352cb5e295b87b663c42c1af96d40356a9c6cf39ddfffc4",
-                        "s" : "0x62df12337b996c328268b362811f9d489f10075a5daea9f8e08dd722ae511ae8",
+                        "r" : "0x18a3a40dd60662189d55eb412a6b040c71463ab490510172b6f3cf59a68fc18c",
+                        "s" : "0x1acd7ae4c4c6c627656d74e3c53ecc930a64209a8c7614d4ca810837062486d8",
                         "to" : "",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d36g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d36g0v0Filler.json
new file mode 100644
index 000000000..2a6623942
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d36g0v0Filler.json
@@ -0,0 +1,62 @@
+{
+    "modexp_d36g0v0" : {
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x02540be400",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000ff2a1e5300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x05f5e100",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6e28ef9dbb0c3e7c8e72e3f6d70868154470a71466fdab05423eac2dcfdcb7d5",
+                        "s" : "0x659f03c9906faa181acb5d1f9c07a1b8b070d284e44e845d044018be411c559c",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d36g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d36g1v0Filler.json
new file mode 100644
index 000000000..74ad83c66
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d36g1v0Filler.json
@@ -0,0 +1,62 @@
+{
+    "modexp_d36g1v0" : {
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x02540be400",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000ff2a1e5300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x015f90",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x426ab070e5284162448f959c45f77868a37c04e957eda24ead38a76771824426",
+                        "s" : "0x72e4a1e3d0c7d9beae0d924484225f0bbb381c1dbf6fbe698d801495367a2fc0",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d36g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d36g2v0Filler.json
new file mode 100644
index 000000000..0a92ef583
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d36g2v0Filler.json
@@ -0,0 +1,62 @@
+{
+    "modexp_d36g2v0" : {
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x02540be400",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000ff2a1e5300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x01adb0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x30943a3b00c38b194c60bc4d3af012147ff1f5cd32719458ef247ebe05baf4c5",
+                        "s" : "0x3838a7266f4f4c86dd57ce8bd936e36ad918c1899fb861118a6190b50d8cfa63",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d36g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d36g3v0Filler.json
new file mode 100644
index 000000000..9421c4c7a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_d36g3v0Filler.json
@@ -0,0 +1,62 @@
+{
+    "modexp_d36g3v0" : {
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x02540be400",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000ff2a1e5300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x8e6007618a220034b7c376cb86f04a6ed14247ec55664b2a3ce90c7304516864",
+                        "s" : "0x563fb96f53a931a8dceb6e62f23a5a49627d296562397dc9810853496fde0e3a",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x02540be400",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x36600060003760206103e8366000600060055af26001556103e851600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_0input_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEEcrecover0_0input_d0g0v0Filler.json
index eaa967a10..eaa967a10 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_0input_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEEcrecover0_0input_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_Gas2999_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEEcrecover0_Gas2999_d0g0v0Filler.json
index 09d600f0c..09d600f0c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_Gas2999_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEEcrecover0_Gas2999_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_NoGas_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEEcrecover0_NoGas_d0g0v0Filler.json
index 80252c095..80252c095 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_NoGas_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEEcrecover0_NoGas_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_completeReturnValue_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEEcrecover0_completeReturnValue_d0g0v0Filler.json
index 1dea99d66..1dea99d66 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_completeReturnValue_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEEcrecover0_completeReturnValue_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEEcrecover0_d0g0v0Filler.json
index 672e57efd..672e57efd 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEEcrecover0_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_gas3000_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEEcrecover0_gas3000_d0g0v0Filler.json
index 9976b4870..9976b4870 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_gas3000_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEEcrecover0_gas3000_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_overlappingInputOutput_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEEcrecover0_overlappingInputOutput_d0g0v0Filler.json
index 03912421b..03912421b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover0_overlappingInputOutput_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEEcrecover0_overlappingInputOutput_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover1_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEEcrecover1_d0g0v0Filler.json
index 0c30f21de..0c30f21de 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover1_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEEcrecover1_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover2_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEEcrecover2_d0g0v0Filler.json
index 409df6318..409df6318 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover2_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEEcrecover2_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover3_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEEcrecover3_d0g0v0Filler.json
index 7bb6e079e..7bb6e079e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover3_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEEcrecover3_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover80_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEEcrecover80_d0g0v0Filler.json
index 33e56606b..33e56606b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecover80_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEEcrecover80_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverH_prefixed0_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEEcrecoverH_prefixed0_d0g0v0Filler.json
index 6e0ffd70d..6e0ffd70d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverH_prefixed0_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEEcrecoverH_prefixed0_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverR_prefixed0_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEEcrecoverR_prefixed0_d0g0v0Filler.json
index 94d517b4b..94d517b4b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverR_prefixed0_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEEcrecoverR_prefixed0_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverS_prefixed0_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEEcrecoverS_prefixed0_d0g0v0Filler.json
index 9c5f28b40..9c5f28b40 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverS_prefixed0_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEEcrecoverS_prefixed0_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverV_prefixed0_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEEcrecoverV_prefixed0_d0g0v0Filler.json
index e996e932b..e996e932b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverV_prefixed0_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEEcrecoverV_prefixed0_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverV_prefixedf0_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEEcrecoverV_prefixedf0_d0g0v0Filler.json
index 8ebd8733a..8ebd8733a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverV_prefixedf0_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEEcrecoverV_prefixedf0_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverV_prefixedf0_d1g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEEcrecoverV_prefixedf0_d1g0v0Filler.json
index c3e7c903b..c3e7c903b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEEcrecoverV_prefixedf0_d1g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEEcrecoverV_prefixedf0_d1g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentitiy_0_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEIdentitiy_0_d0g0v0Filler.json
index 56bc3926b..56bc3926b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentitiy_0_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEIdentitiy_0_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentitiy_1_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEIdentitiy_1_d0g0v0Filler.json
index 083a677f7..083a677f7 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentitiy_1_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEIdentitiy_1_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_1_nonzeroValue_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEIdentity_1_nonzeroValue_d0g0v0Filler.json
index c41457b27..c41457b27 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_1_nonzeroValue_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEIdentity_1_nonzeroValue_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_2_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEIdentity_2_d0g0v0Filler.json
index 64fdc913a..64fdc913a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_2_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEIdentity_2_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_3_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEIdentity_3_d0g0v0Filler.json
index 55d4082d9..55d4082d9 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_3_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEIdentity_3_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEIdentity_4_d0g0v0Filler.json
index 9ed170058..9ed170058 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEIdentity_4_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas17_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEIdentity_4_gas17_d0g0v0Filler.json
index 59a833005..59a833005 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas17_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEIdentity_4_gas17_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas18_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEIdentity_4_gas18_d0g0v0Filler.json
index 88ef792b7..88ef792b7 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_4_gas18_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEIdentity_4_gas18_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_5_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEIdentity_5_d0g0v0Filler.json
index 919b8aeb1..919b8aeb1 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODEIdentity_5_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODEIdentity_5_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_0_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODERipemd160_0_d0g0v0Filler.json
index 51fcf7b6e..51fcf7b6e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_0_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODERipemd160_0_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_1_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODERipemd160_1_d0g0v0Filler.json
index d0979c1bd..d0979c1bd 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_1_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODERipemd160_1_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_2_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODERipemd160_2_d0g0v0Filler.json
index fd6c0a25a..fd6c0a25a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_2_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODERipemd160_2_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODERipemd160_3_d0g0v0Filler.json
index 1c48a6214..1c48a6214 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODERipemd160_3_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_postfixed0_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODERipemd160_3_postfixed0_d0g0v0Filler.json
index c5fd93f55..c5fd93f55 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_postfixed0_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODERipemd160_3_postfixed0_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_prefixed0_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODERipemd160_3_prefixed0_d0g0v0Filler.json
index 64e9acd56..64e9acd56 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_3_prefixed0_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODERipemd160_3_prefixed0_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_4_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODERipemd160_4_d0g0v0Filler.json
index 11a1ee5dc..11a1ee5dc 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_4_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODERipemd160_4_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_4_gas719_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODERipemd160_4_gas719_d0g0v0Filler.json
index 68c77445f..68c77445f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_4_gas719_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODERipemd160_4_gas719_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_5_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODERipemd160_5_d0g0v0Filler.json
index 524d7451b..524d7451b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODERipemd160_5_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODERipemd160_5_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_0_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODESha256_0_d0g0v0Filler.json
index f2c2f51bf..f2c2f51bf 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_0_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODESha256_0_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_1_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODESha256_1_d0g0v0Filler.json
index 6c1e44f79..6c1e44f79 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_1_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODESha256_1_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_1_nonzeroValue_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODESha256_1_nonzeroValue_d0g0v0Filler.json
index 5db49183b..5db49183b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_1_nonzeroValue_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODESha256_1_nonzeroValue_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_2_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODESha256_2_d0g0v0Filler.json
index a7e4f77fb..a7e4f77fb 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_2_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODESha256_2_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODESha256_3_d0g0v0Filler.json
index 38c02bcfb..38c02bcfb 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODESha256_3_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_postfix0_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODESha256_3_postfix0_d0g0v0Filler.json
index 15c174000..15c174000 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_postfix0_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODESha256_3_postfix0_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_prefix0_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODESha256_3_prefix0_d0g0v0Filler.json
index 6f5dae0ae..6f5dae0ae 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_3_prefix0_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODESha256_3_prefix0_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_4_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODESha256_4_d0g0v0Filler.json
index b4e26833f..b4e26833f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_4_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODESha256_4_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_4_gas99_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODESha256_4_gas99_d0g0v0Filler.json
index 31c4e83d9..31c4e83d9 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_4_gas99_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODESha256_4_gas99_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_5_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODESha256_5_d0g0v0Filler.json
index 3c31d684c..3c31d684c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CALLCODESha256_5_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CALLCODESha256_5_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_0input_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallEcrecover0_0input_d0g0v0Filler.json
index c85c7c3aa..c85c7c3aa 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_0input_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallEcrecover0_0input_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_Gas2999_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallEcrecover0_Gas2999_d0g0v0Filler.json
index 25da4f2dd..25da4f2dd 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_Gas2999_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallEcrecover0_Gas2999_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_NoGas_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallEcrecover0_NoGas_d0g0v0Filler.json
index 2352228ef..2352228ef 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_NoGas_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallEcrecover0_NoGas_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_completeReturnValue_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallEcrecover0_completeReturnValue_d0g0v0Filler.json
index 619c79b56..619c79b56 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_completeReturnValue_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallEcrecover0_completeReturnValue_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallEcrecover0_d0g0v0Filler.json
index 59b26da83..59b26da83 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallEcrecover0_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_gas3000_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallEcrecover0_gas3000_d0g0v0Filler.json
index 8c42124d6..8c42124d6 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_gas3000_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallEcrecover0_gas3000_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_overlappingInputOutput_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallEcrecover0_overlappingInputOutput_d0g0v0Filler.json
index 1d45f4739..1d45f4739 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallEcrecover0_overlappingInputOutput_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallEcrecover0_overlappingInputOutput_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallEcrecover1_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallEcrecover1_d0g0v0Filler.json
index 2dcff93e7..2dcff93e7 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallEcrecover1_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallEcrecover1_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallEcrecover2_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallEcrecover2_d0g0v0Filler.json
index e4044333c..e4044333c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallEcrecover2_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallEcrecover2_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallEcrecover3_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallEcrecover3_d0g0v0Filler.json
index 25c2ac12a..25c2ac12a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallEcrecover3_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallEcrecover3_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallEcrecover80_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallEcrecover80_d0g0v0Filler.json
index be81f873b..be81f873b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallEcrecover80_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallEcrecover80_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallEcrecoverCheckLengthWrongV_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallEcrecoverCheckLengthWrongV_d0g0v0Filler.json
index 44bd50e55..44bd50e55 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallEcrecoverCheckLengthWrongV_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallEcrecoverCheckLengthWrongV_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallEcrecoverCheckLength_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallEcrecoverCheckLength_d0g0v0Filler.json
index 9074252ee..9074252ee 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallEcrecoverCheckLength_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallEcrecoverCheckLength_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallEcrecoverH_prefixed0_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallEcrecoverH_prefixed0_d0g0v0Filler.json
index ed1a1524d..ed1a1524d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallEcrecoverH_prefixed0_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallEcrecoverH_prefixed0_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallEcrecoverR_prefixed0_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallEcrecoverR_prefixed0_d0g0v0Filler.json
index a1f0c58d0..a1f0c58d0 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallEcrecoverR_prefixed0_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallEcrecoverR_prefixed0_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallEcrecoverS_prefixed0_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallEcrecoverS_prefixed0_d0g0v0Filler.json
index d00583a8b..d00583a8b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallEcrecoverS_prefixed0_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallEcrecoverS_prefixed0_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallEcrecoverV_prefixed0_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallEcrecoverV_prefixed0_d0g0v0Filler.json
index 8555739bc..8555739bc 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallEcrecoverV_prefixed0_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallEcrecoverV_prefixed0_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallIdentitiy_0_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallIdentitiy_0_d0g0v0Filler.json
index ddbdde6ca..ddbdde6ca 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallIdentitiy_0_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallIdentitiy_0_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallIdentitiy_1_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallIdentitiy_1_d0g0v0Filler.json
index dc68c3100..dc68c3100 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallIdentitiy_1_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallIdentitiy_1_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallIdentity_1_nonzeroValue_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallIdentity_1_nonzeroValue_d0g0v0Filler.json
index 847c5b62a..847c5b62a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallIdentity_1_nonzeroValue_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallIdentity_1_nonzeroValue_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallIdentity_2_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallIdentity_2_d0g0v0Filler.json
index bfbc5d9f7..bfbc5d9f7 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallIdentity_2_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallIdentity_2_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallIdentity_3_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallIdentity_3_d0g0v0Filler.json
index 93a708c0f..93a708c0f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallIdentity_3_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallIdentity_3_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallIdentity_4_d0g0v0Filler.json
index 21bc7d0b9..21bc7d0b9 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallIdentity_4_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_gas17_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallIdentity_4_gas17_d0g0v0Filler.json
index f835d7f4d..f835d7f4d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_gas17_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallIdentity_4_gas17_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_gas18_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallIdentity_4_gas18_d0g0v0Filler.json
index a84de8f77..a84de8f77 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallIdentity_4_gas18_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallIdentity_4_gas18_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallIdentity_5_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallIdentity_5_d0g0v0Filler.json
index c48a00d78..c48a00d78 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallIdentity_5_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallIdentity_5_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallRipemd160_0_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallRipemd160_0_d0g0v0Filler.json
index d22d2bea7..d22d2bea7 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallRipemd160_0_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallRipemd160_0_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallRipemd160_1_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallRipemd160_1_d0g0v0Filler.json
index 9760ef791..9760ef791 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallRipemd160_1_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallRipemd160_1_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallRipemd160_2_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallRipemd160_2_d0g0v0Filler.json
index 5413f95e3..5413f95e3 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallRipemd160_2_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallRipemd160_2_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallRipemd160_3_d0g0v0Filler.json
index 750385d76..750385d76 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallRipemd160_3_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_postfixed0_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallRipemd160_3_postfixed0_d0g0v0Filler.json
index b3de0b354..b3de0b354 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_postfixed0_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallRipemd160_3_postfixed0_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_prefixed0_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallRipemd160_3_prefixed0_d0g0v0Filler.json
index 24ce776c9..24ce776c9 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallRipemd160_3_prefixed0_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallRipemd160_3_prefixed0_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallRipemd160_4_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallRipemd160_4_d0g0v0Filler.json
index 188c318da..188c318da 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallRipemd160_4_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallRipemd160_4_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallRipemd160_4_gas719_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallRipemd160_4_gas719_d0g0v0Filler.json
index d0e073713..d0e073713 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallRipemd160_4_gas719_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallRipemd160_4_gas719_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallRipemd160_5_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallRipemd160_5_d0g0v0Filler.json
index 24832b20c..24832b20c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallRipemd160_5_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallRipemd160_5_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallSha256_0_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallSha256_0_d0g0v0Filler.json
index 19fa3cfb9..19fa3cfb9 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallSha256_0_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallSha256_0_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallSha256_1_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallSha256_1_d0g0v0Filler.json
index 0ab1d91e3..0ab1d91e3 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallSha256_1_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallSha256_1_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallSha256_1_nonzeroValue_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallSha256_1_nonzeroValue_d0g0v0Filler.json
index 9c33b4168..9c33b4168 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallSha256_1_nonzeroValue_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallSha256_1_nonzeroValue_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallSha256_2_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallSha256_2_d0g0v0Filler.json
index cb8f8bf5d..cb8f8bf5d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallSha256_2_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallSha256_2_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallSha256_3_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallSha256_3_d0g0v0Filler.json
index bf0e8592c..bf0e8592c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallSha256_3_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallSha256_3_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallSha256_3_postfix0_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallSha256_3_postfix0_d0g0v0Filler.json
index 30b96b089..30b96b089 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallSha256_3_postfix0_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallSha256_3_postfix0_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallSha256_3_prefix0_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallSha256_3_prefix0_d0g0v0Filler.json
index ef48c01cf..ef48c01cf 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallSha256_3_prefix0_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallSha256_3_prefix0_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallSha256_4_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallSha256_4_d0g0v0Filler.json
index dd120a727..dd120a727 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallSha256_4_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallSha256_4_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallSha256_4_gas99_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallSha256_4_gas99_d0g0v0Filler.json
index 48914bdfb..48914bdfb 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallSha256_4_gas99_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallSha256_4_gas99_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallSha256_5_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallSha256_5_d0g0v0Filler.json
index c0b8311f8..c0b8311f8 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/CallSha256_5_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/CallSha256_5_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexpRandomInput_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexpRandomInput_d0g0v0Filler.json
new file mode 100644
index 000000000..7676c7b61
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexpRandomInput_d0g0v0Filler.json
@@ -0,0 +1,55 @@
+{
+    "modexpRandomInput_d0g0v0" : {
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x05f5e100",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000e300000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x0ad570",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x41fd5511dbb403047bc5498f30d75f2dd2fdeac98a103807c31900eb17bc10ef",
+                        "s" : "0x0bb0349ba6a48b040494133fba7cdcf86ab4ab130f0a570fea91569622e9612f",
+                        "to" : "0x0000000000000000000000000000000000000005",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "3535353535353535353535353535353535353535",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexpRandomInput_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexpRandomInput_d0g1v0Filler.json
new file mode 100644
index 000000000..99576447a
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexpRandomInput_d0g1v0Filler.json
@@ -0,0 +1,55 @@
+{
+    "modexpRandomInput_d0g1v0" : {
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x05f5e100",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000000e300000000000000000000000000000000000000000000000000",
+                        "gasLimit" : "0x6acfc0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb0f96af4a341d9a1346fdd37f633eb5017ff95d6312b4cbd7533a21dfecb3302",
+                        "s" : "0x1b4b565910d9767b232e0d39d3bd997fa95a02093269bb15d22239d4135fefeb",
+                        "to" : "0x0000000000000000000000000000000000000005",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "3535353535353535353535353535353535353535",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexpRandomInput_d1g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexpRandomInput_d1g0v0Filler.json
new file mode 100644
index 000000000..053cc4474
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexpRandomInput_d1g0v0Filler.json
@@ -0,0 +1,55 @@
+{
+    "modexpRandomInput_d1g0v0" : {
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x05f5e100",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x00000000008000000000000000000000000000000000000000000000000000000000000400000000000000000000000a",
+                        "gasLimit" : "0x0ad570",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7f92f6c87aa5aae5de02f4fef7b8625a4705dcc83101f5064e85d0451d6f7061",
+                        "s" : "0x17646ae6179dc3564553aa73ff108c14e72d191c147bfa38b4885b7b88548c23",
+                        "to" : "0x0000000000000000000000000000000000000005",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "3535353535353535353535353535353535353535",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexpRandomInput_d1g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexpRandomInput_d1g1v0Filler.json
new file mode 100644
index 000000000..ad835e9a0
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexpRandomInput_d1g1v0Filler.json
@@ -0,0 +1,55 @@
+{
+    "modexpRandomInput_d1g1v0" : {
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x05f5e100",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x00000000008000000000000000000000000000000000000000000000000000000000000400000000000000000000000a",
+                        "gasLimit" : "0x6acfc0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x1146ab4d2425f6d4771a02c80223b8ba38e236b06b08062041b6d173137dac48",
+                        "s" : "0x60be39d14b2fd099aaca849e4785dbc283612fb335239c3d37056afc9edfe998",
+                        "to" : "0x0000000000000000000000000000000000000005",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "3535353535353535353535353535353535353535",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexpRandomInput_d2g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexpRandomInput_d2g0v0Filler.json
new file mode 100644
index 000000000..3bf706dd8
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexpRandomInput_d2g0v0Filler.json
@@ -0,0 +1,55 @@
+{
+    "modexpRandomInput_d2g0v0" : {
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x05f5e100",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001147000000000000000000000000000000000000000000000000000000000061660350000000000000000000000000000000000000000000000000000000000000008",
+                        "gasLimit" : "0x0ad570",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xa61dd9f5a65cd90ee4caf2b2660743384f5777328b536d21851d94fc8bc17b7e",
+                        "s" : "0x135b6e1801f3a2b34b301dd8667e859b58a4b876c7d506b242957a3b33e9f77d",
+                        "to" : "0x0000000000000000000000000000000000000005",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "3535353535353535353535353535353535353535",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexpRandomInput_d2g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexpRandomInput_d2g1v0Filler.json
new file mode 100644
index 000000000..0c98bc0f4
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexpRandomInput_d2g1v0Filler.json
@@ -0,0 +1,55 @@
+{
+    "modexpRandomInput_d2g1v0" : {
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x05f5e100",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001147000000000000000000000000000000000000000000000000000000000061660350000000000000000000000000000000000000000000000000000000000000008",
+                        "gasLimit" : "0x6acfc0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb37d77a66c3e92e5bc6ce02c5cf681dc209534afb388b763837cff9400b6a69b",
+                        "s" : "0x08d5cbe47b56954f8a061cfe20c4144f5331587210444a3d0d8b6cbc21869c",
+                        "to" : "0x0000000000000000000000000000000000000005",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "3535353535353535353535353535353535353535",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3635c9adc5dea00000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_20500_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexp_0_0_0_20500_d0g0v0Filler.json
index e628ab071..e628ab071 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_20500_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexp_0_0_0_20500_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_20500_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexp_0_0_0_20500_d0g1v0Filler.json
index e9e4dd082..e9e4dd082 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_20500_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexp_0_0_0_20500_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_20500_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexp_0_0_0_20500_d0g2v0Filler.json
index c67f30671..c67f30671 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_20500_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexp_0_0_0_20500_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_20500_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexp_0_0_0_20500_d0g3v0Filler.json
index 1efb38746..1efb38746 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_20500_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexp_0_0_0_20500_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_22000_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexp_0_0_0_22000_d0g0v0Filler.json
index 3086f8340..3086f8340 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_22000_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexp_0_0_0_22000_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_22000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexp_0_0_0_22000_d0g1v0Filler.json
index 608d30e15..608d30e15 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_22000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexp_0_0_0_22000_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_22000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexp_0_0_0_22000_d0g2v0Filler.json
index a39cd252f..a39cd252f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_22000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexp_0_0_0_22000_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_22000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexp_0_0_0_22000_d0g3v0Filler.json
index 0e62c16f6..0e62c16f6 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_22000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexp_0_0_0_22000_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_25000_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexp_0_0_0_25000_d0g0v0Filler.json
index 444de82fb..444de82fb 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_25000_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexp_0_0_0_25000_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_25000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexp_0_0_0_25000_d0g1v0Filler.json
index 8e4636e76..8e4636e76 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_25000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexp_0_0_0_25000_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_25000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexp_0_0_0_25000_d0g2v0Filler.json
index 0a02464fc..0a02464fc 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_25000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexp_0_0_0_25000_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_25000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexp_0_0_0_25000_d0g3v0Filler.json
index 26e969660..26e969660 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_25000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexp_0_0_0_25000_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_35000_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexp_0_0_0_35000_d0g0v0Filler.json
index 0d23a4aa3..0d23a4aa3 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_35000_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexp_0_0_0_35000_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_35000_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexp_0_0_0_35000_d0g1v0Filler.json
index aeac73211..aeac73211 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_35000_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexp_0_0_0_35000_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_35000_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexp_0_0_0_35000_d0g2v0Filler.json
index 7b5e7fe42..7b5e7fe42 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_35000_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexp_0_0_0_35000_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_35000_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexp_0_0_0_35000_d0g3v0Filler.json
index 1de138805..1de138805 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts/modexp_0_0_0_35000_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stPreCompiledContracts2/modexp_0_0_0_35000_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest384_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest384_d0g0v0Filler.json
index 873f4e8ae..873f4e8ae 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest384_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest384_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest385_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest385_d0g0v0Filler.json
index 20d9b6ccf..20d9b6ccf 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest385_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest385_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest386_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest386_d0g0v0Filler.json
index ed539284c..ed539284c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest386_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest386_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest387_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest387_d0g0v0Filler.json
index 444533461..444533461 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest387_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest387_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest388_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest388_d0g0v0Filler.json
index f39e95175..f39e95175 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest388_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest388_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest389_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest389_d0g0v0Filler.json
index c804232a0..c804232a0 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest389_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest389_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest391_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest391_d0g0v0Filler.json
index 9baa784a3..9baa784a3 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest391_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest391_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest393_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest393_d0g0v0Filler.json
index 999cd615e..999cd615e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest393_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest393_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest395_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest395_d0g0v0Filler.json
index 84db4651b..84db4651b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest395_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest395_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest396_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest396_d0g0v0Filler.json
index ef5930259..ef5930259 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest396_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest396_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest397_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest397_d0g0v0Filler.json
index 162f42ceb..162f42ceb 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest397_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest397_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest398_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest398_d0g0v0Filler.json
index 40c29d433..40c29d433 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest398_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest398_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest399_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest399_d0g0v0Filler.json
index 6b9dc484e..6b9dc484e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest399_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest399_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest401_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest401_d0g0v0Filler.json
index 821ba9d4b..821ba9d4b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest401_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest401_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest402_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest402_d0g0v0Filler.json
index 206c5938f..206c5938f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest402_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest402_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest404_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest404_d0g0v0Filler.json
index f5d20c68c..f5d20c68c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest404_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest404_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest405_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest405_d0g0v0Filler.json
index b887c8424..b887c8424 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest405_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest405_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest406_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest406_d0g0v0Filler.json
index d9df670f6..d9df670f6 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest406_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest406_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest407_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest407_d0g0v0Filler.json
index 20781d72c..20781d72c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest407_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest407_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest408_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest408_d0g0v0Filler.json
index cca1f7961..cca1f7961 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest408_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest408_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest409_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest409_d0g0v0Filler.json
index abdd22d51..abdd22d51 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest409_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest409_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest410_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest410_d0g0v0Filler.json
index 79ca22806..79ca22806 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest410_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest410_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest411_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest411_d0g0v0Filler.json
index 22129f28b..22129f28b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest411_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest411_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest412_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest412_d0g0v0Filler.json
index 5787c4d2d..5787c4d2d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest412_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest412_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest413_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest413_d0g0v0Filler.json
index 09744fbec..09744fbec 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest413_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest413_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest414_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest414_d0g0v0Filler.json
index c48203939..c48203939 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest414_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest414_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest415_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest415_d0g0v0Filler.json
index 9c406c98b..9c406c98b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest415_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest415_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest416_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest416_d0g0v0Filler.json
index 19c06062c..19c06062c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest416_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest416_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest417_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest417_d0g0v0Filler.json
index 3997bf47d..3997bf47d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest417_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest417_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest418_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest418_d0g0v0Filler.json
index c878fc477..c878fc477 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest418_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest418_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest419_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest419_d0g0v0Filler.json
index 400594920..400594920 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest419_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest419_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest420_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest420_d0g0v0Filler.json
index 5cb84cd4b..5cb84cd4b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest420_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest420_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest421_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest421_d0g0v0Filler.json
index 35491b3f8..35491b3f8 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest421_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest421_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest422_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest422_d0g0v0Filler.json
index 412c09d42..412c09d42 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest422_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest422_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest423_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest423_d0g0v0Filler.json
index c2084f219..c2084f219 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest423_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest423_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest424_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest424_d0g0v0Filler.json
index 31b29294f..31b29294f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest424_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest424_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest425_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest425_d0g0v0Filler.json
index b0bde18e7..b0bde18e7 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest425_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest425_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest426_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest426_d0g0v0Filler.json
index 0d835e08a..0d835e08a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest426_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest426_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest428_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest428_d0g0v0Filler.json
index d1c0bc9bc..d1c0bc9bc 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest428_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest428_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest429_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest429_d0g0v0Filler.json
index d699566c5..d699566c5 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest429_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest429_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest430_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest430_d0g0v0Filler.json
index 96c0259ad..96c0259ad 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest430_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest430_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest433_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest433_d0g0v0Filler.json
index f48f41b07..f48f41b07 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest433_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest433_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest435_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest435_d0g0v0Filler.json
index b885f588f..b885f588f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest435_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest435_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest436_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest436_d0g0v0Filler.json
index 484741ac5..484741ac5 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest436_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest436_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest437_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest437_d0g0v0Filler.json
index 2823164c1..2823164c1 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest437_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest437_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest438_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest438_d0g0v0Filler.json
index 3762585dc..3762585dc 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest438_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest438_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest439_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest439_d0g0v0Filler.json
index 68679bf26..68679bf26 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest439_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest439_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest440_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest440_d0g0v0Filler.json
index 75960f1ba..75960f1ba 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest440_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest440_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest441_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest441_d0g0v0Filler.json
index 65cd86455..65cd86455 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest441_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest441_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest442_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest442_d0g0v0Filler.json
index e4a18f791..e4a18f791 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest442_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest442_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest443_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest443_d0g0v0Filler.json
index 7f0bf84dc..7f0bf84dc 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest443_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest443_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest444_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest444_d0g0v0Filler.json
index 4877c9fb9..4877c9fb9 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest444_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest444_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest445_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest445_d0g0v0Filler.json
index 4a1d9d02d..4a1d9d02d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest445_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest445_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest446_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest446_d0g0v0Filler.json
index 271a24377..271a24377 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest446_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest446_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest447_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest447_d0g0v0Filler.json
index 51448d800..51448d800 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest447_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest447_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest448_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest448_d0g0v0Filler.json
index 8bca46a69..8bca46a69 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest448_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest448_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest449_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest449_d0g0v0Filler.json
index d85511415..d85511415 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest449_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest449_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest450_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest450_d0g0v0Filler.json
index fe6ca2acb..fe6ca2acb 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest450_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest450_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest451_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest451_d0g0v0Filler.json
index 92bc4b692..92bc4b692 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest451_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest451_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest452_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest452_d0g0v0Filler.json
index a18ef634d..a18ef634d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest452_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest452_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest454_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest454_d0g0v0Filler.json
index 817fac327..817fac327 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest454_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest454_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest455_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest455_d0g0v0Filler.json
index 61dc0a47e..61dc0a47e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest455_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest455_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest456_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest456_d0g0v0Filler.json
index 7876661e8..7876661e8 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest456_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest456_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest457_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest457_d0g0v0Filler.json
index 0c42825e4..0c42825e4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest457_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest457_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest458_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest458_d0g0v0Filler.json
index 4604568b0..4604568b0 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest458_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest458_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest460_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest460_d0g0v0Filler.json
index 7409c8a64..7409c8a64 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest460_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest460_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest461_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest461_d0g0v0Filler.json
index 5eb3cb4fc..5eb3cb4fc 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest461_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest461_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest462_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest462_d0g0v0Filler.json
index 044f7eb70..044f7eb70 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest462_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest462_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest464_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest464_d0g0v0Filler.json
index 5d4d72fb9..5d4d72fb9 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest464_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest464_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest465_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest465_d0g0v0Filler.json
index 95890a09d..95890a09d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest465_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest465_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest466_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest466_d0g0v0Filler.json
index 21eadf2b3..21eadf2b3 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest466_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest466_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest467_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest467_d0g0v0Filler.json
index ff587e6fa..ff587e6fa 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest467_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest467_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest468_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest468_d0g0v0Filler.json
index 443bddef6..443bddef6 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest468_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest468_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest469_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest469_d0g0v0Filler.json
index df232e6a6..df232e6a6 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest469_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest469_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest470_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest470_d0g0v0Filler.json
index f4171cd75..f4171cd75 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest470_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest470_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest471_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest471_d0g0v0Filler.json
index 4b9a674fa..4b9a674fa 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest471_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest471_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest472_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest472_d0g0v0Filler.json
index 92446fb40..92446fb40 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest472_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest472_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest473_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest473_d0g0v0Filler.json
index cb739e8d0..cb739e8d0 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest473_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest473_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest474_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest474_d0g0v0Filler.json
index 8d7c2b4d6..8d7c2b4d6 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest474_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest474_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest475_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest475_d0g0v0Filler.json
index d16889398..d16889398 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest475_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest475_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest476_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest476_d0g0v0Filler.json
index cc87c7c97..cc87c7c97 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest476_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest476_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest477_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest477_d0g0v0Filler.json
index 34995ae4b..34995ae4b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest477_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest477_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest478_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest478_d0g0v0Filler.json
index 73e5220dd..73e5220dd 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest478_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest478_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest480_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest480_d0g0v0Filler.json
index 20b49c1cb..20b49c1cb 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest480_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest480_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest481_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest481_d0g0v0Filler.json
index a99dc1ac1..a99dc1ac1 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest481_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest481_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest482_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest482_d0g0v0Filler.json
index e9dbd7ab2..e9dbd7ab2 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest482_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest482_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest483_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest483_d0g0v0Filler.json
index 53abb844d..53abb844d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest483_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest483_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest484_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest484_d0g0v0Filler.json
index 54381fc2a..54381fc2a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest484_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest484_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest485_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest485_d0g0v0Filler.json
index b302a9b3b..b302a9b3b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest485_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest485_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest487_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest487_d0g0v0Filler.json
index 4befd8087..4befd8087 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest487_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest487_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest488_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest488_d0g0v0Filler.json
index 40ba3f24d..40ba3f24d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest488_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest488_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest489_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest489_d0g0v0Filler.json
index 04eaae262..04eaae262 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest489_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest489_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest491_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest491_d0g0v0Filler.json
index 8073c4b30..8073c4b30 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest491_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest491_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest493_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest493_d0g0v0Filler.json
index fdc72f820..fdc72f820 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest493_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest493_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest494_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest494_d0g0v0Filler.json
index 376693085..376693085 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest494_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest494_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest495_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest495_d0g0v0Filler.json
index 2a1cb33dc..2a1cb33dc 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest495_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest495_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest496_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest496_d0g0v0Filler.json
index 96c0b54b0..96c0b54b0 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest496_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest496_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest497_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest497_d0g0v0Filler.json
index fabb0d233..fabb0d233 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest497_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest497_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest498_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest498_d0g0v0Filler.json
index 512194d1c..512194d1c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest498_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest498_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest499_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest499_d0g0v0Filler.json
index 2a4ca31c1..2a4ca31c1 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest499_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest499_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest500_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest500_d0g0v0Filler.json
index fcd9c830d..fcd9c830d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest500_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest500_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest501_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest501_d0g0v0Filler.json
index cad7b950f..cad7b950f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest501_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest501_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest502_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest502_d0g0v0Filler.json
index 6ebc8998b..6ebc8998b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest502_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest502_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest503_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest503_d0g0v0Filler.json
index 680d2953f..680d2953f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest503_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest503_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest504_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest504_d0g0v0Filler.json
index fda00d14a..fda00d14a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest504_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest504_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest505_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest505_d0g0v0Filler.json
index e521cefb0..e521cefb0 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest505_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest505_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest506_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest506_d0g0v0Filler.json
index e78822437..e78822437 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest506_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest506_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest507_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest507_d0g0v0Filler.json
index a1e3f6802..a1e3f6802 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest507_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest507_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest508_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest508_d0g0v0Filler.json
index 38e6a6e29..38e6a6e29 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest508_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest508_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest509_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest509_d0g0v0Filler.json
index 4e21ba1aa..4e21ba1aa 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest509_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest509_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest510_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest510_d0g0v0Filler.json
index ccef60232..ccef60232 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest510_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest510_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest511_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest511_d0g0v0Filler.json
index 7f9877261..7f9877261 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest511_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest511_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest512_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest512_d0g0v0Filler.json
index 6a288ca1f..6a288ca1f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest512_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest512_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest513_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest513_d0g0v0Filler.json
index 95fae81c4..95fae81c4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest513_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest513_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest514_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest514_d0g0v0Filler.json
index 2ce682bfa..2ce682bfa 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest514_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest514_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest516_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest516_d0g0v0Filler.json
index 8d2b54b34..8d2b54b34 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest516_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest516_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest517_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest517_d0g0v0Filler.json
index ed89bf38e..ed89bf38e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest517_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest517_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest518_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest518_d0g0v0Filler.json
index 96f51dd3b..96f51dd3b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest518_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest518_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest519_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest519_d0g0v0Filler.json
index 43f48d89f..43f48d89f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest519_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest519_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest520_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest520_d0g0v0Filler.json
index 3e8e8654d..3e8e8654d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest520_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest520_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest521_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest521_d0g0v0Filler.json
index b33a2ab76..b33a2ab76 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest521_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest521_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest523_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest523_d0g0v0Filler.json
index c4bec4bdc..c4bec4bdc 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest523_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest523_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest524_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest524_d0g0v0Filler.json
index 793645660..793645660 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest524_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest524_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest525_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest525_d0g0v0Filler.json
index e8af15dae..e8af15dae 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest525_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest525_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest526_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest526_d0g0v0Filler.json
index dba47be9e..dba47be9e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest526_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest526_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest527_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest527_d0g0v0Filler.json
index 8803d91b6..8803d91b6 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest527_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest527_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest528_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest528_d0g0v0Filler.json
index ccabaf6ce..ccabaf6ce 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest528_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest528_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest531_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest531_d0g0v0Filler.json
index 23c4f9f7d..23c4f9f7d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest531_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest531_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest532_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest532_d0g0v0Filler.json
index 0531009fb..0531009fb 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest532_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest532_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest533_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest533_d0g0v0Filler.json
index 188dc626f..188dc626f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest533_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest533_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest534_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest534_d0g0v0Filler.json
index 7e8e077fa..7e8e077fa 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest534_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest534_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest535_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest535_d0g0v0Filler.json
index 54f2e5e7a..54f2e5e7a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest535_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest535_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest536_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest536_d0g0v0Filler.json
index 12394dd14..12394dd14 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest536_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest536_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest537_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest537_d0g0v0Filler.json
index 87f91a4dc..87f91a4dc 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest537_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest537_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest538_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest538_d0g0v0Filler.json
index 9fe51efd8..9fe51efd8 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest538_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest538_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest539_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest539_d0g0v0Filler.json
index 62b4bed79..62b4bed79 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest539_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest539_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest541_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest541_d0g0v0Filler.json
index ae8d0ffeb..ae8d0ffeb 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest541_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest541_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest542_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest542_d0g0v0Filler.json
index d5fe58cb1..d5fe58cb1 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest542_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest542_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest543_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest543_d0g0v0Filler.json
index 0f7d8826f..0f7d8826f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest543_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest543_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest544_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest544_d0g0v0Filler.json
index 2696d5cb6..2696d5cb6 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest544_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest544_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest545_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest545_d0g0v0Filler.json
index 725f67e74..725f67e74 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest545_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest545_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest546_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest546_d0g0v0Filler.json
index 255e36c66..255e36c66 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest546_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest546_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest547_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest547_d0g0v0Filler.json
index 4af7e779d..4af7e779d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest547_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest547_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest548_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest548_d0g0v0Filler.json
index fb147770c..fb147770c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest548_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest548_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest549_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest549_d0g0v0Filler.json
index f448effe6..f448effe6 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest549_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest549_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest550_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest550_d0g0v0Filler.json
index cbddd17c0..cbddd17c0 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest550_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest550_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest552_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest552_d0g0v0Filler.json
index afac07505..afac07505 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest552_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest552_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest553_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest553_d0g0v0Filler.json
index 46361890f..46361890f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest553_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest553_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest554_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest554_d0g0v0Filler.json
index 6e7d12538..6e7d12538 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest554_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest554_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest555_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest555_d0g0v0Filler.json
index 04b956646..04b956646 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest555_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest555_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest556_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest556_d0g0v0Filler.json
index 1434434fe..1434434fe 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest556_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest556_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest558_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest558_d0g0v0Filler.json
index 56c49c006..56c49c006 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest558_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest558_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest559_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest559_d0g0v0Filler.json
index 6f102ac1b..6f102ac1b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest559_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest559_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest560_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest560_d0g0v0Filler.json
index c3aee8fe2..c3aee8fe2 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest560_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest560_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest562_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest562_d0g0v0Filler.json
index 717efabd5..717efabd5 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest562_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest562_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest563_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest563_d0g0v0Filler.json
index b200ef364..b200ef364 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest563_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest563_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest564_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest564_d0g0v0Filler.json
index ec4456ddf..ec4456ddf 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest564_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest564_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest565_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest565_d0g0v0Filler.json
index b45f2d2ea..b45f2d2ea 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest565_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest565_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest566_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest566_d0g0v0Filler.json
index e1409f948..e1409f948 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest566_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest566_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest567_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest567_d0g0v0Filler.json
index 066c67e13..066c67e13 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest567_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest567_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest569_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest569_d0g0v0Filler.json
index 66de4317f..66de4317f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest569_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest569_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest571_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest571_d0g0v0Filler.json
index 3217ff840..3217ff840 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest571_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest571_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest572_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest572_d0g0v0Filler.json
index 82574c9a1..82574c9a1 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest572_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest572_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest573_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest573_d0g0v0Filler.json
index cb39ae99c..cb39ae99c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest573_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest573_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest574_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest574_d0g0v0Filler.json
index 3264ba4ad..3264ba4ad 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest574_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest574_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest575_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest575_d0g0v0Filler.json
index 7ec81cf61..7ec81cf61 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest575_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest575_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest576_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest576_d0g0v0Filler.json
index d210a89c8..d210a89c8 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest576_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest576_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest577_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest577_d0g0v0Filler.json
index 2380dde40..2380dde40 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest577_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest577_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest578_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest578_d0g0v0Filler.json
index f865ef2f4..f865ef2f4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest578_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest578_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest579_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest579_d0g0v0Filler.json
index 6a0c30e39..6a0c30e39 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest579_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest579_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest580_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest580_d0g0v0Filler.json
index 3b5c96657..3b5c96657 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest580_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest580_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest581_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest581_d0g0v0Filler.json
index 1047ae1cc..1047ae1cc 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest581_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest581_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest582_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest582_d0g0v0Filler.json
index eef6d209a..eef6d209a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest582_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest582_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest583_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest583_d0g0v0Filler.json
index ebf79f6ef..ebf79f6ef 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest583_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest583_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest584_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest584_d0g0v0Filler.json
index 61120dc11..61120dc11 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest584_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest584_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest585_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest585_d0g0v0Filler.json
index d2c690389..d2c690389 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest585_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest585_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest586_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest586_d0g0v0Filler.json
index 4f3c8ae3c..4f3c8ae3c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest586_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest586_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest587_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest587_d0g0v0Filler.json
index 3e33338c0..3e33338c0 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest587_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest587_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest588_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest588_d0g0v0Filler.json
index 41a43055d..41a43055d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest588_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest588_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest589_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest589_d0g0v0Filler.json
index 37d6bb0c7..37d6bb0c7 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest589_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest589_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest592_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest592_d0g0v0Filler.json
index bc0326fd4..bc0326fd4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest592_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest592_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest594_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest594_d0g0v0Filler.json
index 048cd5d64..048cd5d64 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest594_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest594_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest596_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest596_d0g0v0Filler.json
index 4cd7d8a43..4cd7d8a43 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest596_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest596_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest597_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest597_d0g0v0Filler.json
index 4322ab6fd..4322ab6fd 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest597_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest597_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest599_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest599_d0g0v0Filler.json
index fb94a7a68..fb94a7a68 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest599_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest599_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest600_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest600_d0g0v0Filler.json
index 6df385539..6df385539 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest600_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest600_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest601_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest601_d0g0v0Filler.json
index d61410207..d61410207 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest601_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest601_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest602_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest602_d0g0v0Filler.json
index e44aaac64..e44aaac64 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest602_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest602_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest603_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest603_d0g0v0Filler.json
index cb4803361..cb4803361 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest603_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest603_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest604_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest604_d0g0v0Filler.json
index 7c75ac330..7c75ac330 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest604_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest604_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest605_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest605_d0g0v0Filler.json
index b85addfa3..b85addfa3 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest605_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest605_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest607_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest607_d0g0v0Filler.json
index 79382942d..79382942d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest607_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest607_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest608_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest608_d0g0v0Filler.json
index 0de4f523c..0de4f523c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest608_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest608_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest609_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest609_d0g0v0Filler.json
index 3df1bd934..3df1bd934 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest609_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest609_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest610_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest610_d0g0v0Filler.json
index 0cd93b749..0cd93b749 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest610_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest610_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest611_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest611_d0g0v0Filler.json
index b36645087..b36645087 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest611_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest611_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest612_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest612_d0g0v0Filler.json
index a91b2bf38..a91b2bf38 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest612_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest612_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest615_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest615_d0g0v0Filler.json
index 4f5d1873a..4f5d1873a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest615_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest615_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest616_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest616_d0g0v0Filler.json
index fa627654b..fa627654b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest616_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest616_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest618_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest618_d0g0v0Filler.json
index 1a356fb3e..1a356fb3e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest618_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest618_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest619_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest619_d0g0v0Filler.json
index 645c18151..645c18151 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest619_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest619_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest620_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest620_d0g0v0Filler.json
index 40171d5c5..40171d5c5 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest620_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest620_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest621_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest621_d0g0v0Filler.json
index f2790df19..f2790df19 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest621_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest621_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest624_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest624_d0g0v0Filler.json
index b5d002c3a..b5d002c3a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest624_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest624_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest625_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest625_d0g0v0Filler.json
index 71541d193..71541d193 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest625_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest625_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest626_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest626_d0g0v0Filler.json
index 6c2b643c1..6c2b643c1 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest626_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest626_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest627_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest627_d0g0v0Filler.json
index de4c6d4f7..de4c6d4f7 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest627_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest627_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest628_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest628_d0g0v0Filler.json
index 9b00bdf4e..9b00bdf4e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest628_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest628_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest629_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest629_d0g0v0Filler.json
index 4233f7074..4233f7074 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest629_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest629_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest630_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest630_d0g0v0Filler.json
index ef48a1356..ef48a1356 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest630_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest630_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest632_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest632_d0g0v0Filler.json
index 241d7580d..241d7580d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest632_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest632_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest633_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest633_d0g0v0Filler.json
index 2f6bc3f4c..2f6bc3f4c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest633_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest633_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest635_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest635_d0g0v0Filler.json
index 4562e6b02..4562e6b02 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest635_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest635_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest636_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest636_d0g0v0Filler.json
index 02bf8c66c..02bf8c66c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest636_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest636_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest637_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest637_d0g0v0Filler.json
index 3f497c284..3f497c284 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest637_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest637_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest638_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest638_d0g0v0Filler.json
index 67245afbe..67245afbe 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest638_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest638_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest639_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest639_d0g0v0Filler.json
index b9e6cd5ce..b9e6cd5ce 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest639_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest639_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest640_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest640_d0g0v0Filler.json
index b349aa342..b349aa342 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest640_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest640_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest641_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest641_d0g0v0Filler.json
index fdf4122be..fdf4122be 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest641_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest641_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest642_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest642_d0g0v0Filler.json
index d502f6a62..d502f6a62 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest642_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest642_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest643_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest643_d0g0v0Filler.json
index 3bf8ed65f..3bf8ed65f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest643_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest643_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest644_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest644_d0g0v0Filler.json
index 21433b9e5..21433b9e5 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest644_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest644_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest645_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest645_d0g0v0Filler.json
index a5f5977d0..a5f5977d0 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest645_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest645_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest645_d0g0v1Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest645_d0g0v1Filler.json
index 61ad36cce..61ad36cce 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest645_d0g0v1Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest645_d0g0v1Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest646_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest646_d0g0v0Filler.json
index 48df032c5..48df032c5 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest646_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest646_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest647_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest647_d0g0v0Filler.json
new file mode 100644
index 000000000..d9cc52193
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest647_d0g0v0Filler.json
@@ -0,0 +1,62 @@
+{
+    "randomStatetest647_d0g0v0" : {
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x42fe8c95373ea1",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x584d31",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb8b4255ee0ebbc999fd83d5247c119f9c089e9a2ce40d52b234288fd77856839",
+                        "s" : "0x362d599ccebcbc12dae17e88f74e55df047a99916bc7b4e164f203ba7c1106ef",
+                        "to" : "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "d94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x42fe8c95373ea1",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x3b9aca00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x00",
+                "code" : "0x6001600160000360003e00",
+                "nonce" : "0x07",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest_d0g0v0Filler.json
index 531a8628a..531a8628a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRandom/randomStatetest_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRandom2/randomStatetest_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stReturnDataTest/returndatacopy_afterFailing_create_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stReturnDataTest/returndatacopy_afterFailing_create_d0g0v0Filler.json
new file mode 100644
index 000000000..1b42a4b79
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stReturnDataTest/returndatacopy_afterFailing_create_d0g0v0Filler.json
@@ -0,0 +1,63 @@
+{
+    "returndatacopy_afterFailing_create_d0g0v0" : {
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x0a00000000",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0a00000000",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3b6c2d4d0d9d0abf4d624a6f2930e213789e9c00f679a9afa996fb4bd27cb507",
+                        "s" : "0x24a40d7f4cf44278ac739ecf9eeba61554646709142d968ed1c555be138a3ea2",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x00",
+                "code" : "0x69600260005260206000fd600052600a60166000f0503d6000556020600060003e600051600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stReturnDataTest/returndatasize_after_oog_after_deeper_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stReturnDataTest/returndatasize_after_oog_after_deeper_d0g0v0Filler.json
new file mode 100644
index 000000000..738337597
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stReturnDataTest/returndatasize_after_oog_after_deeper_d0g0v0Filler.json
@@ -0,0 +1,79 @@
+{
+    "returndatasize_after_oog_after_deeper_d0g0v0" : {
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x0a00000000",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0a00000000",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xd645bcff7a04b34bc1f20889cffafd8bf9764818e4eff2556c4513c3e6aa4426",
+                        "s" : "0x758a2988d8cdfe9eebdf3e6d1d2c63bd9718c956af62e21af76f52e047ace5e8",
+                        "to" : "0x1000000000000000000000000000000000000001",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x1000000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x6020600060006000600073a94f5374fce5edbc8e2a8697c15331677e6ebf0b620186a0f16002553d600055600051600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xffffffff",
+                    "0x01" : "0xffffffff",
+                    "0x02" : "0xffffffff"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x100000000000",
+                "code" : "0x6000600060006000600073bb00000000000000000000000000000000000000620186a0f1505b60011560345760016000556025565b",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xbb00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "0x60ff60005260206000f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stReturnDataTest/returndatasize_bug_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stReturnDataTest/returndatasize_bug_d0g0v0Filler.json
new file mode 100644
index 000000000..8e7828f63
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stReturnDataTest/returndatasize_bug_d0g0v0Filler.json
@@ -0,0 +1,70 @@
+{
+    "returndatasize_bug_d0g0v0" : {
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x0a00000000",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0a00000000",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3b6c2d4d0d9d0abf4d624a6f2930e213789e9c00f679a9afa996fb4bd27cb507",
+                        "s" : "0x24a40d7f4cf44278ac739ecf9eeba61554646709142d968ed1c555be138a3ea2",
+                        "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0a00000000",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x600060006000600061c350731f572e5295c57f15886f9b263e2f6d2d6c7b5ec66001f1503d600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x00",
+                "code" : "0x600060006000600061c3506001600af1506001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/PythonRevertTestTue201814-1430_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/PythonRevertTestTue201814-1430_d0g0v0Filler.json
new file mode 100644
index 000000000..a665b302b
--- /dev/null
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/PythonRevertTestTue201814-1430_d0g0v0Filler.json
@@ -0,0 +1,83 @@
+{
+    "PythonRevertTestTue201814-1430_d0g0v0" : {
+        "blocks" : [
+            {
+                "blockHeaderPremine" : {
+                    "difficulty" : "0x020000",
+                    "gasLimit" : "0x14a0583da74c9c",
+                    "timestamp" : "0x03e8",
+                    "updatePoW" : "1"
+                },
+                "transactions" : [
+                    {
+                        "data" : "0x66a9b45d44c78cfe774333fe0c49418dd61f183d41132f5340e48ababb825a26eb0a75c0ca693a8b465121200fd21a7b4c365a65a3255278f672705e5ca0f6146fccd36a6e5b9decfb6e5096887651e829313a2cc9d5b518e25861c31ba04ed3f5a3310bd966993aa534b00785778d9545342410ce8c156d780a8cb4a65efed30aa9d6bd63c4778a134c9cb0c677ecda48aacef0c191de37e3cfdae69153747c2406995ea81bbae6a201663b9b37a6a9f597ae4f40e44e74ea92616bc2956328ced0d77412c265c2925470320e5f285d15a08a263b0a444516817c266bd51fe726677144df3c080d07dd47c4eb9e44a87541ddc5a697163260a06921033eb3542b375cd0d073dfb48f6acde07152794b5539563efff1afed3b0a6b15166526175e7184b83cc2de68df61ec5d65d1eee66ea376fcb84f2c73335db9fba49e3d40638cd7f462f1d3b315f17b8dc1f692a68b2431b166ee71a4ba159dd322b9fa5f3237dfb85d2594056102f261025b61021d6101d3631fe4bdc373ffffffffffffffffffffffffffffffffffffffff631ea09dc6f263edd580947c8177bd72d2244f7652371e3428d28bc6356c553b18d00e6b3cf60206c273abbd7763059f61940b0d19fde33f7b5a96080d25791e9ae89c718dd41c3f57b0c304fbb83978de28d23499bdd19c0472301ff527ccc9f7ed74a8dbd906b468d448fba77f38f193e3047b02e40beb08b4f11707681ef103ec1b00585a85f27227a179f15e7e97a359268b06ff34bcee23a869974fbca6e201cb16179743ac0f8c9f8603d570e26a5aad5217ebfff3140716923723efaa79b6cd87fbc9fd408d4ac5a048e43fb4e7a2b94053bf1fb7257562977725cde415738a99e1a7690cbe409744b737367dedc82e3063516c5bc57e35fcb2038306d9a3a6e46103515279ddcb9d30879e470f5dd81e1148184f62bd61ae9708ff61cee25c63694a73437a42be5043b1fde117ba383682ba0d91e0db8b29c882a044d0c8bb49056a25a66d8480df1b1ccc2564791df94f43d5802aa8f44bf70a6817ed784e5725bdc7718a54d6a567234286085240ba847d575dac25d7fc32c59999a9d38fee0d25e7c23986009c5bb022f7d28a2cab6e01a4bb37dd42ea42d5141d55f5730c7bd82bf08bff3928aea77e7153bcc4a3a53996be367ec98cb6fe85797e771d020284d4d302c8b4ebe6b28a9c64a9ae2ad6894716732f6b245e7fdc5243f79a0ae9b8d874900caa1c5796a2854ceddb00a82b4ec01b513ed61c72ce89400a06fe90a109bad6d5e028143e7552937a0136347eb71a49db0072c87bd437b9cd7b2f7e6e9f3a85875c9ede6036650f9d06d4c2e8692caf2e87043c0bf5a2359c66431acbb35dcbfc6a7b86074b99c9e6f959d8417784e5e40c854c280218c0cd4e98dc3bc44f7d651d7191ead455",
+                        "gasLimit" : "0x2857ab",
+                        "gasPrice" : "0x02",
+                        "nonce" : "0x00",
+                        "r" : "0x2d6eb90a747cc48a1a4d71e0de8bef7b4a86a4798673d796c89717696746fbe0",
+                        "s" : "0x51130dcdccca6f7a78a49e15140401c031e626ed25e99a93c4ae33db661f2232",
+                        "to" : "0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1b",
+                        "value" : "0x254ffcc0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "c94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+            "difficulty" : "131072",
+            "extraData" : "0x42",
+            "gasLimit" : "0x14a0583da74c9c",
+            "gasUsed" : "0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf99eb1626cfa6db435c0836235942d7ccaa935f1ae247d3f1c21e495685f903a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x5b1936a53e6e440f",
+                "code" : "0x601361019f6101013e6f338db2b1165b4918f178852663192a956d79a68b50eefdc639ca0b62ab4d52771db054ccc801c0666b34b3c6242bbfc5e98f20c14fb95e016718be9ad033d50e21675ff59297861847ea6a911a6a9d135e2f826dc6037d850e0db21d105b8732a34b873c7d943050b8659794f0bd3e841d35a2231e65f697f8cde1176728fa2051e87933cf66858e4e5e91baa7764fc1e9ffe4c7b15ba600e88f095989dc68f47ed704be2b99601761021563200fbd63f07e41c7f86732f4d5419b41e6887cca98e0943f141a5c66df98bd0c6d6c4cec657893afaa8ce1769c96cd0751aa76a98c8196fa8c92e70d7bda176299c91c3e7a7f05de3181109b8194387746f9ec15a6e0233f759e43360bd4e0a06e4e9f395117afcd072774ce12d13dc761016152303a683305858002a92140b678508e3a3be377d4825dbf618a393c7c061e75a8a496a33afe0f72017f2e33549e321838b083d48893f23dced4597e2e9ea08fe3f80970d6334b6c6f1fde8bcc81d03a7ccc244231cb6606dba6d06ec1c5158ef0db6994192acbd4cac6ab6ac8449d80fc2c32471946e071d9606bd390266d7f712766f4765076283ad6687450d7ab4df6f3f6ee9661014a70b802ec9d7ed96dc0b9ce7bd14b193dc1f05376d11ce19283c7f651d4d2e7c180715ff7fcbc995ea8b2766213cc517d6dad16d17f29a93220ce0ddb0a65d3d474dbc39cba5bcb3d4fcf9fef1910607d64c04511df277f522ab2475fbb2ba0720711a903dbecfa0429bf11e6e90cbb0f13d4ee050c52c87365e0216b4096186fc604fb563fa59f1263ee91d5695e407fdffe82ca1558f7876a93f3a218dd9ba6901fdea93d6be498f0b0e1874331115e31aa6fad4d87227362a9ec3e1c1be11cdb2309697bbc0c692eeadfa9161669b8aec24564487dc74f8e7d17e6a133b5dbe576838697de73f856197203ef1a3a54f7edb0dbd60f9d5274db6b5c1477169b77f0d817ed731a20db4b9e5b83d2786bffefab084a31c4afda168156612f281da0be688e5bdb1f3176ed78bc62343a7665abad6573482449e68b3acfe820993d77df5785384d51aaa0612dab5ddbf2a9bf550736ad422933878861011961023ffd608f61022d61021661036e635af7465b73ffffffffffffffffffffffffffffffffffffffff63792c6916f16ed70693587df6ccfae5218d01559bac60156102006101adfd",
+                "nonce" : "0x15",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xab56295c9d120548",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x882fd85bc18c9f00",
+                "code" : "0x7abee2a270429abbd3ff3b9945f72f58dcf4f8b344417a87dfa1ebd7601f5232609b6103ee61027b6101326342a46f5073b94f5374fce5edbc8e2a8697c15331677e6ebf0b632c1e2816f26101726101ec61013161012473d94f5374fce5edbc8e2a8697c15331677e6ebf0b632318d76ffa7201a0ff381bb40bb828d7781d2ef7c0fd8695f77c05465fbadf99fdffef2afd94b0e76531b6ea0d23d2332d13c20368a072644e41bc113079a6b1ebc3464527e34c26a4379f9dfe4f8e57981a9fc08558c90d537538079f1921b60fe6fa448171fec55c4c63e81171221164cf72f489a45775e83a2f5427eab647b075a910929de0a6554fc1426b49547acd8e2c770339616ce9c501fb746715dd4a20219229d0673ac055997e3bd089a6663f6dff488574195b848fbb357eb7be1fff076e997770d03b7028536103b36102846103056102db73b94f5374fce5edbc8e2a8697c15331677e6ebf0b6347cfe65df4423a6b8679871dc28aa5a1399b21c86102e460476101f3605b73ffffffffffffffffffffffffffffffffffffffff6311ecd01bfa76afa8155ecd75dd05f9d7eb42fa3e79c6a2109dff2a1e5361030a6101b2fd610263605861011761027f63459d135b7300000000000000000000000000000000000000056342ce224df274e612fbe000bed18eec8345f005f537c72820d8b97360e3526b50ae523a8f7467ae14a8bd9a6aaee55862b685e32476cc6762ae2c4068cf55729540d111f44c9260e76101bc6103f33e68639458dae7ad2a9b38629ed3bb1060d861036afd610123610359636db4b55bf0626021696101775263ea8a7b3a641bcf9219191a6103be6103716101f73e74c0413cb5d609ca9a51645238e4f1f8268f973c3a0169a0b67479a345d1e700655360166101736102f2610214633ff89b317300000000000000000000000000000000000000066335adeabdf13d7ee6d218af54c3d8045447d06c726801695cfa26fdfaa6460a8685cd662855a5547f5716140ae0b1e25aeaf04ae7cf54e8aa7a22206da5a6e52bdd3ef82ad40a46815177d25811167b0a3f66a727652592924dc1291a6085d537c5da6101b1601d6103a33e752d6272a54f882460bc76407d6361c40cc56bc88a8bc960726103ec6102c16101f3731000000000000000000000000000000000000000635f449586f4",
+                "nonce" : "0x1d",
+                "storage" : {
+                }
+            },
+            "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x054c814f188394c8",
+                "code" : "0x610326610100f379c940b5f2046740058558468f238b85db7f6bbe3f3d51e92a3e3268b7f7c4147541c695f376705288410b81b217e80726fb9e4c5c7b4c49eca0c1b6b97e117c16c26c9816459f38396ffc36da48d65defdc7d055cbc846c07e81cfab0fb607c6cbc968774d4de7df8e3236f581e688cc2081a96b1cad9e0609b70f4fddda49ae97714e7d325ceab23acd5f46ba15b5210474116121921a04f68f3f933b9ad91b735bf71bfe41da706499c5d47b6de1fe398cb91fdf66481cbb8661d71d457cf3cef75dabf5ea496d7012f4c56b9fe70e6c4204720e3ce66874cead08499d57a547b97d37744ce205e051f296fb116fc9e5f3c280919aff3c93c5d5cefff9a6102d86103ca6364b68c8ef07d",
+                "nonce" : "0x1d",
+                "storage" : {
+                }
+            },
+            "0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x845252b8509dc215",
+                "code" : "0x6102fa60ff60f561014873c94f5374fce5edbc8e2a8697c15331677e6ebf0b630277795afa689497edb6a665eae52f3d625249756103a55260a860fb60cb3e6102dd6103e0fd6f568a159c0cae9044d258c55b10f4d100628d29ab781df7fcebb789e2a8cdbaa9c67c42cd1ebe81716ead0e94c7216d279dd3a0b3de311596d54729287873449ccce511e6991b3dc636a178159a3d9a06227462cd9a6768ccba17c2cb06de468e95730bf78e55af17e19973f2c3f5d4c21c169890b9a9672491f91aa1e7142667060d385ed594e21b6d02b23a6c4c50e7ab6a3ef66f83a2927f9845b4ba85c4fdfbd0054a0123ad93eff4b525b0f4b08d285f36f3bcac6a985b66906c348472b7cb047bc5a02e618666f0c50eecdc11f20fc1dc41c2fd957752e55ede4e56f469f536a04d436ad418a1ca7a44c0173c10f1806ba284f9c9c7c13670005de594dec538cd56c2746b3bfdfa7683ae0df68bbcb5347d61be606ef617322e6448e3e4124dbe061257a8f486529de397f08ce92502a37b957f855818082b5b5b49e36de5a83e8a270663088571bf2fdf8f5f2961031452326fb9499741e3859928a237f5e5df84c13c6043556b1e82328f9093e64defbdd07d7774d84835800999791abc41260472d96f604d07198e859adc0b70806beae7200cf116d2b55e89ddd564abc36d900e69a68b0f0e9e4f129987288153605d7d01c42f3b109ed2bd72a6cf13500241c2a5e5c4e17ea9ed9b05ba9b57d70d63d270ece77f6ecf21d3a41ad554f79584dcab761d4c8437774cad4bb13b2bece140358df93e76c0f49abe102cd44e474ab71c0237247865fa2add74c8b2a33d6f7041c5718a2554a72662720296dff5b377b559df4558b8a5b2c9e7d15eb3947a70064f935c8fdf0a4e726f644aa31b42c10280e50ea92a366c3d060c1270c6a16a75522fbeb3d7cca702807f5217816eab9cceb9e237ee8fde4ed3a23d3ec87adb334ac1caa7e06523b0132dd615cf3fc16140d34c191617823c3a7bf47c42bc36b69cb4385463595c7f6f9ea451e05303603e0cd401e13d6ff744e2a673824d943941551704ff14df7fa8646efbb2d8abc4ac6e258e9924924b8001f8f0650d66b37411d484b18f41e77c792bd1c169fa52bbfc8af4a45f20acb0ef95db2ecbc0d4eadbbbf6732f648bd33b36336dc0faf0cf1970bcd38093a50a44fd6b253b0e74f2706239c499217b8c3263dae332e254711d5d5e7e795c998cceed14cf46977e7d3cbb35783c79ef0530c3a8ac3fd8d49f10bb0ae919fa149adead67dae035627de430622813ac6271b51873b94f5374fce5edbc8e2a8697c15331677e6ebf0b3c7fb9ba628e056e0e87e029b8e5f42821d775338e6774301ecb428b3938236ee22b7d0b5edf2ad6997869f427ba0672a7168614233e85f61dae5ed4283a53f60570116dad586dce62833a62ca8c914c641f8660526101d761010761031c73c94f5374fce5edbc8e2a8697c15331677e6ebf0b6333d3d55ff4611a5b631c4ea729816102566103ce6101c161014a73000000000000000000000000000000000000000663202b2ea8f4610221610106602e3e648a95029ecb72849fe0943cb9d854c7d50ad04cfdfe648e286876b8f2b53e55fe01a152c8496cbcc6997447062b734cebde04796c6452e9efc4aba5bf071cbff56208a525a8ef5f52399b4f33697bd988884f58166d734881774eff46d77bb189c89c55b1c6591f178d2d7c21bf2b023adf9bc5b8621235e3346d98d56047a3f71241fd5a24abbb0c73fc463fb8a5e67e32055696fe51258dd07526ebd87e439bcebb514ae26dc12d653a5c1263705109097ec5dcdb3918ab114985f7097fd3003b50e58fba91007825a6b800f644eaa306051808460fc3b2d8e276b2187c7b583ff29ee0b0c34f9ee57bac9ebb996402e3300ddf06c760fc5f531f746b1e2beda7a15c07f90f92422822e8d33c5d2409ea7375197f7cd6d61770eddb078206cfc7c5006cd0e97da9ec65fa4fc683da22cfaf6dfc995feb5f8386a052851fc502f32e7ef9346e3d4633def4c0a4b9be12f2cd7c646062e14ca37cfb977524f677714c3d994ea05f1997a2462fc0ab20ed2a5958f37126029b6102056102c9605d6103a173b94f5374fce5edbc8e2a8697c15331677e6ebf0b6302e83dbef4",
+                "nonce" : "0x1d",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d0g0v0Filler.json
index 2c16bc7d6..b23d76bb0 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d0g0v0Filler.json
@@ -95,7 +95,7 @@
             },
             "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x600c60015560016000fd",
+                "code" : "0x600c60015560016000fd600d600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d0g1v0Filler.json
index 8e535b248..ea83568bf 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d0g1v0Filler.json
@@ -95,7 +95,7 @@
             },
             "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x600c60015560016000fd",
+                "code" : "0x600c60015560016000fd600d600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d1g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d1g0v0Filler.json
index b11ecc1bd..1caf1641a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d1g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d1g0v0Filler.json
@@ -95,7 +95,7 @@
             },
             "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x600c60015560016000fd",
+                "code" : "0x600c60015560016000fd600d600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d1g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d1g1v0Filler.json
index 0e89e9959..963832174 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d1g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d1g1v0Filler.json
@@ -95,7 +95,7 @@
             },
             "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x600c60015560016000fd",
+                "code" : "0x600c60015560016000fd600d600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d2g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d2g0v0Filler.json
index 1517d4f7d..c42be77f7 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d2g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d2g0v0Filler.json
@@ -95,7 +95,7 @@
             },
             "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x600c60015560016000fd",
+                "code" : "0x600c60015560016000fd600d600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d2g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d2g1v0Filler.json
index 23bfc4f19..1ca9d09bb 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d2g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d2g1v0Filler.json
@@ -95,7 +95,7 @@
             },
             "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x600c60015560016000fd",
+                "code" : "0x600c60015560016000fd600d600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d3g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d3g0v0Filler.json
index 4bcf3959f..182bb9ad3 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d3g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d3g0v0Filler.json
@@ -95,7 +95,7 @@
             },
             "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x600c60015560016000fd",
+                "code" : "0x600c60015560016000fd600d600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d3g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d3g1v0Filler.json
index 0520e52e7..31463c017 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d3g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stRevertTest/RevertOpcodeInCallsOnNonEmptyReturnData_d3g1v0Filler.json
@@ -95,7 +95,7 @@
             },
             "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x01",
-                "code" : "0x600c60015560016000fd",
+                "code" : "0x600c60015560016000fd600d600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_0_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_0_d0g0v0Filler.json
index bafca697e..bafca697e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_0_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_0_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_0_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_0_d0g1v0Filler.json
index 4375397ae..4375397ae 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_0_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_0_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_0_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_0_d0g2v0Filler.json
index 1f8aa9160..1f8aa9160 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_0_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_0_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_0_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_0_d0g3v0Filler.json
index 8b26dd972..8b26dd972 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_0_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_0_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_128_d0g0v0Filler.json
index 491d2031a..491d2031a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_128_d0g1v0Filler.json
index 69a8d183a..69a8d183a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_128_d0g2v0Filler.json
index 5d64fdb03..5d64fdb03 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_128_d0g3v0Filler.json
index 6c4d26d1c..6c4d26d1c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_192_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_192_d0g0v0Filler.json
index 74ab6fc9b..74ab6fc9b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_192_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_192_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_192_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_192_d0g1v0Filler.json
index 5c6a83cea..5c6a83cea 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_192_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_192_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_192_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_192_d0g2v0Filler.json
index 26a331eb8..26a331eb8 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_192_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_192_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_192_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_192_d0g3v0Filler.json
index af79c7f68..af79c7f68 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_192_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_192_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_64_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_64_d0g0v0Filler.json
index f2694cdaf..f2694cdaf 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_64_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_64_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_64_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_64_d0g1v0Filler.json
index e0a9d51db..e0a9d51db 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_64_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_64_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_64_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_64_d0g2v0Filler.json
index 23bcd9a90..23bcd9a90 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_64_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_64_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_64_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_64_d0g3v0Filler.json
index 73244295a..73244295a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_64_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_64_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_80_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_80_d0g0v0Filler.json
index fdb06ea6c..fdb06ea6c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_80_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_80_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_80_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_80_d0g1v0Filler.json
index 1095163aa..1095163aa 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_80_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_80_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_80_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_80_d0g2v0Filler.json
index ccbd15d77..ccbd15d77 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_80_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_80_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_80_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_80_d0g3v0Filler.json
index bbca66096..bbca66096 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_21000_80_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_21000_80_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_0_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_0_d0g0v0Filler.json
index b1edb18eb..b1edb18eb 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_0_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_0_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_0_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_0_d0g1v0Filler.json
index 0010535ee..0010535ee 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_0_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_0_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_0_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_0_d0g2v0Filler.json
index d2b2aa875..d2b2aa875 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_0_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_0_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_0_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_0_d0g3v0Filler.json
index 4b81be73a..4b81be73a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_0_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_0_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_128_d0g0v0Filler.json
index ddbf4df8b..ddbf4df8b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_128_d0g1v0Filler.json
index 15135509b..15135509b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_128_d0g2v0Filler.json
index beeec4534..beeec4534 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_128_d0g3v0Filler.json
index 0a13e19b4..0a13e19b4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_192_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_192_d0g0v0Filler.json
index 2a04d970d..2a04d970d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_192_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_192_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_192_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_192_d0g1v0Filler.json
index a4e1ff94f..a4e1ff94f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_192_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_192_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_192_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_192_d0g2v0Filler.json
index c7b3f9b42..c7b3f9b42 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_192_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_192_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_192_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_192_d0g3v0Filler.json
index 127222919..127222919 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_192_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_192_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_64_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_64_d0g0v0Filler.json
index 3cef9826d..3cef9826d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_64_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_64_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_64_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_64_d0g1v0Filler.json
index 9d7938dbb..9d7938dbb 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_64_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_64_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_64_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_64_d0g2v0Filler.json
index 75fab5338..75fab5338 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_64_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_64_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_64_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_64_d0g3v0Filler.json
index ab798c607..ab798c607 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_64_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_64_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_80_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_80_d0g0v0Filler.json
index 4d8a19c64..4d8a19c64 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_80_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_80_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_80_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_80_d0g1v0Filler.json
index 16a9632c9..16a9632c9 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_80_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_80_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_80_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_80_d0g2v0Filler.json
index cde55af92..cde55af92 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_80_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_80_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_80_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_80_d0g3v0Filler.json
index af5fb724a..af5fb724a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_0-0_25000_80_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_0-0_25000_80_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-2_21000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-2_21000_128_d0g0v0Filler.json
index 44345ad68..44345ad68 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-2_21000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-2_21000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-2_21000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-2_21000_128_d0g1v0Filler.json
index 9346311c2..9346311c2 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-2_21000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-2_21000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-2_21000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-2_21000_128_d0g2v0Filler.json
index 2d25de873..2d25de873 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-2_21000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-2_21000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-2_21000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-2_21000_128_d0g3v0Filler.json
index 590e2d699..590e2d699 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-2_21000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-2_21000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-2_21000_192_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-2_21000_192_d0g0v0Filler.json
index 342a23cf4..342a23cf4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-2_21000_192_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-2_21000_192_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-2_21000_192_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-2_21000_192_d0g1v0Filler.json
index 3ede9557b..3ede9557b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-2_21000_192_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-2_21000_192_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-2_21000_192_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-2_21000_192_d0g2v0Filler.json
index c8b7648ec..c8b7648ec 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-2_21000_192_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-2_21000_192_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-2_21000_192_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-2_21000_192_d0g3v0Filler.json
index e70a281df..e70a281df 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-2_21000_192_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-2_21000_192_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-2_25000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-2_25000_128_d0g0v0Filler.json
index d78fd45bd..d78fd45bd 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-2_25000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-2_25000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-2_25000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-2_25000_128_d0g1v0Filler.json
index 853045ee3..853045ee3 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-2_25000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-2_25000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-2_25000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-2_25000_128_d0g2v0Filler.json
index af131ca4b..af131ca4b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-2_25000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-2_25000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-2_25000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-2_25000_128_d0g3v0Filler.json
index 8c397efee..8c397efee 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-2_25000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-2_25000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-2_25000_192_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-2_25000_192_d0g0v0Filler.json
index 1aba869b3..1aba869b3 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-2_25000_192_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-2_25000_192_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-2_25000_192_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-2_25000_192_d0g1v0Filler.json
index 7d3861043..7d3861043 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-2_25000_192_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-2_25000_192_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-2_25000_192_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-2_25000_192_d0g2v0Filler.json
index 2ccd2f6da..2ccd2f6da 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-2_25000_192_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-2_25000_192_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-2_25000_192_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-2_25000_192_d0g3v0Filler.json
index 4af2f6717..4af2f6717 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-2_25000_192_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-2_25000_192_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-3_21000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-3_21000_128_d0g0v0Filler.json
index 3c1a134a7..3c1a134a7 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-3_21000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-3_21000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-3_21000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-3_21000_128_d0g1v0Filler.json
index 7f18bbd58..7f18bbd58 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-3_21000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-3_21000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-3_21000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-3_21000_128_d0g2v0Filler.json
index 5cc8a2930..5cc8a2930 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-3_21000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-3_21000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-3_21000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-3_21000_128_d0g3v0Filler.json
index 50c1a2fba..50c1a2fba 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-3_21000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-3_21000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-3_25000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-3_25000_128_d0g0v0Filler.json
index ed1ae7328..ed1ae7328 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-3_25000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-3_25000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-3_25000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-3_25000_128_d0g1v0Filler.json
index a594e5407..a594e5407 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-3_25000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-3_25000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-3_25000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-3_25000_128_d0g2v0Filler.json
index 5d585babf..5d585babf 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-3_25000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-3_25000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-3_25000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-3_25000_128_d0g3v0Filler.json
index fea882e18..fea882e18 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-0_1-3_25000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-0_1-3_25000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-3_1-2_21000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-3_1-2_21000_128_d0g0v0Filler.json
index abe521660..abe521660 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-3_1-2_21000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-3_1-2_21000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-3_1-2_21000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-3_1-2_21000_128_d0g1v0Filler.json
index bf05c4607..bf05c4607 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-3_1-2_21000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-3_1-2_21000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-3_1-2_21000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-3_1-2_21000_128_d0g2v0Filler.json
index 54096f52b..54096f52b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-3_1-2_21000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-3_1-2_21000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-3_1-2_21000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-3_1-2_21000_128_d0g3v0Filler.json
index 18cd82f79..18cd82f79 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-3_1-2_21000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-3_1-2_21000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-3_1-2_25000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-3_1-2_25000_128_d0g0v0Filler.json
index 24ba09621..24ba09621 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-3_1-2_25000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-3_1-2_25000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-3_1-2_25000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-3_1-2_25000_128_d0g1v0Filler.json
index 87835401a..87835401a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-3_1-2_25000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-3_1-2_25000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-3_1-2_25000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-3_1-2_25000_128_d0g2v0Filler.json
index c917f767f..c917f767f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-3_1-2_25000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-3_1-2_25000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-3_1-2_25000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-3_1-2_25000_128_d0g3v0Filler.json
index 1762eb600..1762eb600 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_0-3_1-2_25000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_0-3_1-2_25000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_21000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_21000_128_d0g0v0Filler.json
index 2ee5726b2..2ee5726b2 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_21000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_21000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_21000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_21000_128_d0g1v0Filler.json
index 223c73e45..223c73e45 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_21000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_21000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_21000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_21000_128_d0g2v0Filler.json
index 5b043ee29..5b043ee29 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_21000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_21000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_21000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_21000_128_d0g3v0Filler.json
index a22e3be38..a22e3be38 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_21000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_21000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_21000_192_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_21000_192_d0g0v0Filler.json
index 3d0150323..3d0150323 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_21000_192_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_21000_192_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_21000_192_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_21000_192_d0g1v0Filler.json
index b04c99721..b04c99721 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_21000_192_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_21000_192_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_21000_192_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_21000_192_d0g2v0Filler.json
index 5adae9a8f..5adae9a8f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_21000_192_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_21000_192_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_21000_192_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_21000_192_d0g3v0Filler.json
index 3943724a3..3943724a3 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_21000_192_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_21000_192_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_21000_64_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_21000_64_d0g0v0Filler.json
index 32589aa30..32589aa30 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_21000_64_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_21000_64_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_21000_64_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_21000_64_d0g1v0Filler.json
index 94e1bb006..94e1bb006 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_21000_64_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_21000_64_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_21000_64_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_21000_64_d0g2v0Filler.json
index e6ea8ae77..e6ea8ae77 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_21000_64_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_21000_64_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_21000_64_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_21000_64_d0g3v0Filler.json
index 8d369eed8..8d369eed8 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_21000_64_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_21000_64_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_25000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_25000_128_d0g0v0Filler.json
index 3e64e1421..3e64e1421 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_25000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_25000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_25000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_25000_128_d0g1v0Filler.json
index 41db32cd7..41db32cd7 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_25000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_25000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_25000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_25000_128_d0g2v0Filler.json
index e1335fbeb..e1335fbeb 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_25000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_25000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_25000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_25000_128_d0g3v0Filler.json
index 2a0d5bcd3..2a0d5bcd3 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_25000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_25000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_25000_192_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_25000_192_d0g0v0Filler.json
index bbeb60e61..bbeb60e61 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_25000_192_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_25000_192_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_25000_192_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_25000_192_d0g1v0Filler.json
index 4a9d2e02b..4a9d2e02b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_25000_192_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_25000_192_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_25000_192_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_25000_192_d0g2v0Filler.json
index b80b831c5..b80b831c5 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_25000_192_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_25000_192_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_25000_192_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_25000_192_d0g3v0Filler.json
index 3d427133f..3d427133f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_25000_192_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_25000_192_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_25000_64_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_25000_64_d0g0v0Filler.json
index 8e86ebc5f..8e86ebc5f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_25000_64_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_25000_64_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_25000_64_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_25000_64_d0g1v0Filler.json
index a18d2d27e..a18d2d27e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_25000_64_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_25000_64_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_25000_64_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_25000_64_d0g2v0Filler.json
index 3cb21c87d..3cb21c87d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_25000_64_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_25000_64_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_25000_64_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_25000_64_d0g3v0Filler.json
index 04ca69e47..04ca69e47 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_0-0_25000_64_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_0-0_25000_64_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_1-2_21000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_1-2_21000_128_d0g0v0Filler.json
index 37a44cf42..37a44cf42 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_1-2_21000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_1-2_21000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_1-2_21000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_1-2_21000_128_d0g1v0Filler.json
index ec52f5298..ec52f5298 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_1-2_21000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_1-2_21000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_1-2_21000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_1-2_21000_128_d0g2v0Filler.json
index 804497445..804497445 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_1-2_21000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_1-2_21000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_1-2_21000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_1-2_21000_128_d0g3v0Filler.json
index 9eb371d2d..9eb371d2d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_1-2_21000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_1-2_21000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_1-2_21000_192_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_1-2_21000_192_d0g0v0Filler.json
index 80a2c24f3..80a2c24f3 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_1-2_21000_192_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_1-2_21000_192_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_1-2_21000_192_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_1-2_21000_192_d0g1v0Filler.json
index d3a4b105b..d3a4b105b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_1-2_21000_192_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_1-2_21000_192_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_1-2_21000_192_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_1-2_21000_192_d0g2v0Filler.json
index 2185c0f1a..2185c0f1a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_1-2_21000_192_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_1-2_21000_192_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_1-2_21000_192_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_1-2_21000_192_d0g3v0Filler.json
index 371a7a45d..371a7a45d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_1-2_21000_192_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_1-2_21000_192_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_1-2_25000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_1-2_25000_128_d0g0v0Filler.json
index d9d31242c..d9d31242c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_1-2_25000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_1-2_25000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_1-2_25000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_1-2_25000_128_d0g1v0Filler.json
index 271e21c6f..271e21c6f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_1-2_25000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_1-2_25000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_1-2_25000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_1-2_25000_128_d0g2v0Filler.json
index 9493e48bb..9493e48bb 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_1-2_25000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_1-2_25000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_1-2_25000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_1-2_25000_128_d0g3v0Filler.json
index b1129cf0c..b1129cf0c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_1-2_25000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_1-2_25000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_1-2_25000_192_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_1-2_25000_192_d0g0v0Filler.json
index 29e0b65e6..29e0b65e6 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_1-2_25000_192_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_1-2_25000_192_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_1-2_25000_192_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_1-2_25000_192_d0g1v0Filler.json
index 262950f40..262950f40 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_1-2_25000_192_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_1-2_25000_192_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_1-2_25000_192_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_1-2_25000_192_d0g2v0Filler.json
index a8a7bbcca..a8a7bbcca 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_1-2_25000_192_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_1-2_25000_192_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_1-2_25000_192_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_1-2_25000_192_d0g3v0Filler.json
index 0d04538e2..0d04538e2 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-2_1-2_25000_192_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-2_1-2_25000_192_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-3_0-0_21000_80_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-3_0-0_21000_80_d0g0v0Filler.json
index 1d0e45268..1d0e45268 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-3_0-0_21000_80_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-3_0-0_21000_80_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-3_0-0_21000_80_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-3_0-0_21000_80_d0g1v0Filler.json
index 1cc4aece8..1cc4aece8 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-3_0-0_21000_80_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-3_0-0_21000_80_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-3_0-0_21000_80_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-3_0-0_21000_80_d0g2v0Filler.json
index 84438028e..84438028e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-3_0-0_21000_80_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-3_0-0_21000_80_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-3_0-0_21000_80_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-3_0-0_21000_80_d0g3v0Filler.json
index c5030624b..c5030624b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-3_0-0_21000_80_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-3_0-0_21000_80_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-3_0-0_25000_80_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-3_0-0_25000_80_d0g0v0Filler.json
index 0c9ec3c2f..0c9ec3c2f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-3_0-0_25000_80_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-3_0-0_25000_80_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-3_0-0_25000_80_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-3_0-0_25000_80_d0g1v0Filler.json
index 44afd6d44..44afd6d44 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-3_0-0_25000_80_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-3_0-0_25000_80_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-3_0-0_25000_80_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-3_0-0_25000_80_d0g2v0Filler.json
index 04648dd39..04648dd39 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-3_0-0_25000_80_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-3_0-0_25000_80_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-3_0-0_25000_80_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-3_0-0_25000_80_d0g3v0Filler.json
index 553d7ea0a..553d7ea0a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1-3_0-0_25000_80_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1-3_0-0_25000_80_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1145-3932_1145-4651_21000_192_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1145-3932_1145-4651_21000_192_d0g0v0Filler.json
index 506d5214d..506d5214d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1145-3932_1145-4651_21000_192_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1145-3932_1145-4651_21000_192_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1145-3932_1145-4651_21000_192_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1145-3932_1145-4651_21000_192_d0g1v0Filler.json
index 5776515ab..5776515ab 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1145-3932_1145-4651_21000_192_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1145-3932_1145-4651_21000_192_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1145-3932_1145-4651_21000_192_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1145-3932_1145-4651_21000_192_d0g2v0Filler.json
index d00893f5f..d00893f5f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1145-3932_1145-4651_21000_192_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1145-3932_1145-4651_21000_192_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1145-3932_1145-4651_21000_192_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1145-3932_1145-4651_21000_192_d0g3v0Filler.json
index 6b807149d..6b807149d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1145-3932_1145-4651_21000_192_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1145-3932_1145-4651_21000_192_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1145-3932_1145-4651_25000_192_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1145-3932_1145-4651_25000_192_d0g0v0Filler.json
index 6c9a578e1..6c9a578e1 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1145-3932_1145-4651_25000_192_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1145-3932_1145-4651_25000_192_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1145-3932_1145-4651_25000_192_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1145-3932_1145-4651_25000_192_d0g1v0Filler.json
index 6fab8d578..6fab8d578 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1145-3932_1145-4651_25000_192_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1145-3932_1145-4651_25000_192_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1145-3932_1145-4651_25000_192_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1145-3932_1145-4651_25000_192_d0g2v0Filler.json
index 6c275bde5..6c275bde5 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1145-3932_1145-4651_25000_192_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1145-3932_1145-4651_25000_192_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1145-3932_1145-4651_25000_192_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1145-3932_1145-4651_25000_192_d0g3v0Filler.json
index cccd2c9c5..cccd2c9c5 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1145-3932_1145-4651_25000_192_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1145-3932_1145-4651_25000_192_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1145-3932_2969-1336_21000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1145-3932_2969-1336_21000_128_d0g0v0Filler.json
index 18bf59ea6..18bf59ea6 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1145-3932_2969-1336_21000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1145-3932_2969-1336_21000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1145-3932_2969-1336_21000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1145-3932_2969-1336_21000_128_d0g1v0Filler.json
index bb8fb6695..bb8fb6695 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1145-3932_2969-1336_21000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1145-3932_2969-1336_21000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1145-3932_2969-1336_21000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1145-3932_2969-1336_21000_128_d0g2v0Filler.json
index b6807f580..b6807f580 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1145-3932_2969-1336_21000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1145-3932_2969-1336_21000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1145-3932_2969-1336_21000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1145-3932_2969-1336_21000_128_d0g3v0Filler.json
index 637997230..637997230 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1145-3932_2969-1336_21000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1145-3932_2969-1336_21000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1145-3932_2969-1336_25000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1145-3932_2969-1336_25000_128_d0g0v0Filler.json
index ab740f07b..ab740f07b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1145-3932_2969-1336_25000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1145-3932_2969-1336_25000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1145-3932_2969-1336_25000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1145-3932_2969-1336_25000_128_d0g1v0Filler.json
index a5d0f453b..a5d0f453b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1145-3932_2969-1336_25000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1145-3932_2969-1336_25000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1145-3932_2969-1336_25000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1145-3932_2969-1336_25000_128_d0g2v0Filler.json
index c3c57b7a9..c3c57b7a9 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1145-3932_2969-1336_25000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1145-3932_2969-1336_25000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1145-3932_2969-1336_25000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1145-3932_2969-1336_25000_128_d0g3v0Filler.json
index 8095ba362..8095ba362 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_1145-3932_2969-1336_25000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_1145-3932_2969-1336_25000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_6-9_19274124-124124_21000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_6-9_19274124-124124_21000_128_d0g0v0Filler.json
index b092b15c2..b092b15c2 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_6-9_19274124-124124_21000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_6-9_19274124-124124_21000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_6-9_19274124-124124_21000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_6-9_19274124-124124_21000_128_d0g1v0Filler.json
index 4cace6004..4cace6004 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_6-9_19274124-124124_21000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_6-9_19274124-124124_21000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_6-9_19274124-124124_21000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_6-9_19274124-124124_21000_128_d0g2v0Filler.json
index 7621272e2..7621272e2 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_6-9_19274124-124124_21000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_6-9_19274124-124124_21000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_6-9_19274124-124124_21000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_6-9_19274124-124124_21000_128_d0g3v0Filler.json
index 2a4e4ac4c..2a4e4ac4c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_6-9_19274124-124124_21000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_6-9_19274124-124124_21000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_6-9_19274124-124124_25000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_6-9_19274124-124124_25000_128_d0g0v0Filler.json
index 72b2757b5..72b2757b5 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_6-9_19274124-124124_25000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_6-9_19274124-124124_25000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_6-9_19274124-124124_25000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_6-9_19274124-124124_25000_128_d0g1v0Filler.json
index 60befac06..60befac06 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_6-9_19274124-124124_25000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_6-9_19274124-124124_25000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_6-9_19274124-124124_25000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_6-9_19274124-124124_25000_128_d0g2v0Filler.json
index e1bdbd3d2..e1bdbd3d2 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_6-9_19274124-124124_25000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_6-9_19274124-124124_25000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_6-9_19274124-124124_25000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_6-9_19274124-124124_25000_128_d0g3v0Filler.json
index 9673d732f..9673d732f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecadd_6-9_19274124-124124_25000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecadd_6-9_19274124-124124_25000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_0_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_0_d0g0v0Filler.json
index 523efee60..523efee60 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_0_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_0_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_0_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_0_d0g1v0Filler.json
index 6fc068a50..6fc068a50 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_0_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_0_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_0_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_0_d0g2v0Filler.json
index ebea184e5..ebea184e5 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_0_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_0_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_0_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_0_d0g3v0Filler.json
index 704ed83da..704ed83da 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_0_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_0_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_128_d0g0v0Filler.json
index 879029f7f..879029f7f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_128_d0g1v0Filler.json
index 6bd881260..6bd881260 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_128_d0g2v0Filler.json
index 06052b1f7..06052b1f7 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_128_d0g3v0Filler.json
index 95cc07965..95cc07965 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_40_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_40_d0g0v0Filler.json
index 7fa9c1b2f..7fa9c1b2f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_40_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_40_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_40_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_40_d0g1v0Filler.json
index f241dff50..f241dff50 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_40_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_40_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_40_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_40_d0g2v0Filler.json
index 198248bac..198248bac 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_40_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_40_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_40_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_40_d0g3v0Filler.json
index b4af37892..b4af37892 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_40_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_40_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_64_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_64_d0g0v0Filler.json
index c64fad552..c64fad552 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_64_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_64_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_64_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_64_d0g1v0Filler.json
index b62154e11..b62154e11 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_64_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_64_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_64_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_64_d0g2v0Filler.json
index 7a7edab88..7a7edab88 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_64_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_64_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_64_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_64_d0g3v0Filler.json
index 002a183f7..002a183f7 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_64_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_64_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_80_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_80_d0g0v0Filler.json
index f3fec518c..f3fec518c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_80_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_80_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_80_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_80_d0g1v0Filler.json
index a652cc4af..a652cc4af 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_80_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_80_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_80_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_80_d0g2v0Filler.json
index 1b74850f9..1b74850f9 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_80_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_80_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_80_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_80_d0g3v0Filler.json
index a862d613f..a862d613f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_80_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_80_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_96_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_96_d0g0v0Filler.json
index a73b12e1e..a73b12e1e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_96_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_96_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_96_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_96_d0g1v0Filler.json
index aec98e56b..aec98e56b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_96_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_96_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_96_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_96_d0g2v0Filler.json
index c4d146a36..c4d146a36 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_96_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_96_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_96_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_96_d0g3v0Filler.json
index 63cdc1fb8..63cdc1fb8 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_21000_96_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_21000_96_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_0_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_0_d0g0v0Filler.json
index 5adbd0703..5adbd0703 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_0_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_0_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_0_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_0_d0g1v0Filler.json
index 0aec7a9a7..0aec7a9a7 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_0_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_0_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_0_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_0_d0g2v0Filler.json
index 17d30d080..17d30d080 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_0_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_0_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_0_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_0_d0g3v0Filler.json
index 76a06d9ef..76a06d9ef 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_0_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_0_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_128_d0g0v0Filler.json
index 1c77f9466..1c77f9466 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_128_d0g1v0Filler.json
index 92f35f108..92f35f108 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_128_d0g2v0Filler.json
index 7dad8d0d7..7dad8d0d7 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_128_d0g3v0Filler.json
index 5c221dbcb..5c221dbcb 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_40_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_40_d0g0v0Filler.json
index ed672eb41..ed672eb41 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_40_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_40_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_40_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_40_d0g1v0Filler.json
index a10640ffb..a10640ffb 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_40_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_40_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_40_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_40_d0g2v0Filler.json
index 5eb9693c8..5eb9693c8 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_40_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_40_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_40_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_40_d0g3v0Filler.json
index 349763bf1..349763bf1 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_40_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_40_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_64_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_64_d0g0v0Filler.json
index 7671e8d82..7671e8d82 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_64_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_64_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_64_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_64_d0g1v0Filler.json
index 4e9a7cee0..4e9a7cee0 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_64_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_64_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_64_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_64_d0g2v0Filler.json
index a274dc619..a274dc619 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_64_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_64_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_64_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_64_d0g3v0Filler.json
index df4da57ee..df4da57ee 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_64_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_64_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_80_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_80_d0g0v0Filler.json
index 169b47d1a..169b47d1a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_80_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_80_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_80_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_80_d0g1v0Filler.json
index b80dab967..b80dab967 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_80_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_80_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_80_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_80_d0g2v0Filler.json
index cee53898c..cee53898c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_80_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_80_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_80_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_80_d0g3v0Filler.json
index 13c8cc7e2..13c8cc7e2 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_80_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_80_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_96_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_96_d0g0v0Filler.json
index 929cb32f3..929cb32f3 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_96_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_96_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_96_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_96_d0g1v0Filler.json
index 919ab1674..919ab1674 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_96_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_96_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_96_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_96_d0g2v0Filler.json
index 2d0f91523..2d0f91523 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_96_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_96_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_96_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_96_d0g3v0Filler.json
index 3b284c031..3b284c031 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_0_28000_96_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_0_28000_96_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_1_21000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_1_21000_128_d0g0v0Filler.json
index c9ba07326..c9ba07326 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_1_21000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_1_21000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_1_21000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_1_21000_128_d0g1v0Filler.json
index 1e50c7315..1e50c7315 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_1_21000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_1_21000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_1_21000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_1_21000_128_d0g2v0Filler.json
index ed7c80939..ed7c80939 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_1_21000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_1_21000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_1_21000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_1_21000_128_d0g3v0Filler.json
index 1069d5bfd..1069d5bfd 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_1_21000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_1_21000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_1_21000_96_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_1_21000_96_d0g0v0Filler.json
index dfc799dec..dfc799dec 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_1_21000_96_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_1_21000_96_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_1_21000_96_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_1_21000_96_d0g1v0Filler.json
index d33e70951..d33e70951 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_1_21000_96_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_1_21000_96_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_1_21000_96_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_1_21000_96_d0g2v0Filler.json
index 6ae12ea29..6ae12ea29 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_1_21000_96_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_1_21000_96_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_1_21000_96_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_1_21000_96_d0g3v0Filler.json
index cba2bb767..cba2bb767 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_1_21000_96_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_1_21000_96_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_1_28000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_1_28000_128_d0g0v0Filler.json
index bff642f66..bff642f66 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_1_28000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_1_28000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_1_28000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_1_28000_128_d0g1v0Filler.json
index 3881d551e..3881d551e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_1_28000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_1_28000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_1_28000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_1_28000_128_d0g2v0Filler.json
index 590ea9df3..590ea9df3 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_1_28000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_1_28000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_1_28000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_1_28000_128_d0g3v0Filler.json
index a4d9cd819..a4d9cd819 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_1_28000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_1_28000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_1_28000_96_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_1_28000_96_d0g0v0Filler.json
index b71d8446e..b71d8446e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_1_28000_96_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_1_28000_96_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_1_28000_96_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_1_28000_96_d0g1v0Filler.json
index 1396b9f18..1396b9f18 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_1_28000_96_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_1_28000_96_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_1_28000_96_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_1_28000_96_d0g2v0Filler.json
index 2479871a3..2479871a3 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_1_28000_96_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_1_28000_96_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_1_28000_96_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_1_28000_96_d0g3v0Filler.json
index dc3f8bec6..dc3f8bec6 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_1_28000_96_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_1_28000_96_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_2_21000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_2_21000_128_d0g0v0Filler.json
index e05ab99e4..e05ab99e4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_2_21000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_2_21000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_2_21000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_2_21000_128_d0g1v0Filler.json
index 4ca89092f..4ca89092f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_2_21000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_2_21000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_2_21000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_2_21000_128_d0g2v0Filler.json
index ed05790e0..ed05790e0 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_2_21000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_2_21000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_2_21000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_2_21000_128_d0g3v0Filler.json
index e8ec10d18..e8ec10d18 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_2_21000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_2_21000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_2_21000_96_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_2_21000_96_d0g0v0Filler.json
index 9bc8c4ce7..9bc8c4ce7 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_2_21000_96_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_2_21000_96_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_2_21000_96_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_2_21000_96_d0g1v0Filler.json
index 9e645e34f..9e645e34f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_2_21000_96_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_2_21000_96_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_2_21000_96_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_2_21000_96_d0g2v0Filler.json
index f80d7d4cb..f80d7d4cb 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_2_21000_96_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_2_21000_96_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_2_21000_96_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_2_21000_96_d0g3v0Filler.json
index 3aa8d4954..3aa8d4954 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_2_21000_96_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_2_21000_96_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_2_28000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_2_28000_128_d0g0v0Filler.json
index 92b7bae7e..92b7bae7e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_2_28000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_2_28000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_2_28000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_2_28000_128_d0g1v0Filler.json
index b61f17931..b61f17931 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_2_28000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_2_28000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_2_28000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_2_28000_128_d0g2v0Filler.json
index 76d75b65e..76d75b65e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_2_28000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_2_28000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_2_28000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_2_28000_128_d0g3v0Filler.json
index 629876955..629876955 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_2_28000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_2_28000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_2_28000_96_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_2_28000_96_d0g0v0Filler.json
index e7750b434..e7750b434 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_2_28000_96_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_2_28000_96_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_2_28000_96_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_2_28000_96_d0g1v0Filler.json
index f44524024..f44524024 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_2_28000_96_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_2_28000_96_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_2_28000_96_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_2_28000_96_d0g2v0Filler.json
index 1655779f7..1655779f7 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_2_28000_96_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_2_28000_96_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_2_28000_96_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_2_28000_96_d0g3v0Filler.json
index c1fdeeed4..c1fdeeed4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_2_28000_96_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_2_28000_96_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_128_d0g0v0Filler.json
index 2f7228cfc..2f7228cfc 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_128_d0g1v0Filler.json
index 185268eef..185268eef 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_128_d0g2v0Filler.json
index 6fcde8209..6fcde8209 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_128_d0g3v0Filler.json
index 365e74164..365e74164 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_80_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_80_d0g0v0Filler.json
index f0ed26004..f0ed26004 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_80_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_80_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_80_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_80_d0g1v0Filler.json
index 9faa61c87..9faa61c87 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_80_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_80_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_80_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_80_d0g2v0Filler.json
index 04b0613ac..04b0613ac 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_80_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_80_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_80_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_80_d0g3v0Filler.json
index 5f79f11c1..5f79f11c1 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_80_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_80_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_96_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_96_d0g0v0Filler.json
index d8f91b766..d8f91b766 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_96_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_96_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_96_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_96_d0g1v0Filler.json
index 16cef89e3..16cef89e3 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_96_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_96_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_96_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_96_d0g2v0Filler.json
index d8ad090a7..d8ad090a7 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_96_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_96_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_96_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_96_d0g3v0Filler.json
index a5a30fa23..a5a30fa23 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_96_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_96_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_128_d0g0v0Filler.json
index 9311b2cb4..9311b2cb4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_128_d0g1v0Filler.json
index a8e476bc1..a8e476bc1 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_128_d0g2v0Filler.json
index 446e59a1f..446e59a1f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_128_d0g3v0Filler.json
index 472a8f3fb..472a8f3fb 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_80_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_80_d0g0v0Filler.json
index b8dee29a2..b8dee29a2 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_80_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_80_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_80_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_80_d0g1v0Filler.json
index d91f1f471..d91f1f471 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_80_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_80_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_80_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_80_d0g2v0Filler.json
index 0617867ee..0617867ee 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_80_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_80_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_80_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_80_d0g3v0Filler.json
index 70abb856a..70abb856a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_80_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_80_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_96_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_96_d0g0v0Filler.json
index 701b90152..701b90152 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_96_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_96_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_96_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_96_d0g1v0Filler.json
index 75b82c9d9..75b82c9d9 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_96_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_96_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_96_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_96_d0g2v0Filler.json
index b7ea02d88..b7ea02d88 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_96_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_96_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_96_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_96_d0g3v0Filler.json
index 6a2c80246..6a2c80246 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_96_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_96_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5616_21000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5616_21000_128_d0g0v0Filler.json
index 1e5d5b84d..1e5d5b84d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5616_21000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5616_21000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5616_21000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5616_21000_128_d0g1v0Filler.json
index de01c4d9c..de01c4d9c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5616_21000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5616_21000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5616_21000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5616_21000_128_d0g2v0Filler.json
index cf6941935..cf6941935 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5616_21000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5616_21000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5616_21000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5616_21000_128_d0g3v0Filler.json
index d2da706a9..d2da706a9 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5616_21000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5616_21000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5616_21000_96_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5616_21000_96_d0g0v0Filler.json
index 8e61793e9..8e61793e9 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5616_21000_96_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5616_21000_96_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5616_21000_96_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5616_21000_96_d0g1v0Filler.json
index 37a13c854..37a13c854 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5616_21000_96_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5616_21000_96_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5616_21000_96_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5616_21000_96_d0g2v0Filler.json
index 52cc11b4e..52cc11b4e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5616_21000_96_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5616_21000_96_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5616_21000_96_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5616_21000_96_d0g3v0Filler.json
index 09aac6d1d..09aac6d1d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5616_21000_96_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5616_21000_96_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5616_28000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5616_28000_128_d0g0v0Filler.json
index 02f87540a..02f87540a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5616_28000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5616_28000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5616_28000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5616_28000_128_d0g1v0Filler.json
index b18b7ed62..b18b7ed62 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5616_28000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5616_28000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5616_28000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5616_28000_128_d0g2v0Filler.json
index 840f59e8e..840f59e8e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5616_28000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5616_28000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5616_28000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5616_28000_128_d0g3v0Filler.json
index 311f4c324..311f4c324 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5616_28000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5616_28000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5616_28000_96_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5616_28000_96_d0g0v0Filler.json
index 25a31a9dd..25a31a9dd 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5616_28000_96_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5616_28000_96_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5616_28000_96_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5616_28000_96_d0g1v0Filler.json
index 11471a1b9..11471a1b9 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5616_28000_96_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5616_28000_96_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5616_28000_96_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5616_28000_96_d0g2v0Filler.json
index 8399ed3be..8399ed3be 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5616_28000_96_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5616_28000_96_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5616_28000_96_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5616_28000_96_d0g3v0Filler.json
index 4a719066b..4a719066b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5616_28000_96_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5616_28000_96_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5617_21000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5617_21000_128_d0g0v0Filler.json
index aa498f927..aa498f927 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5617_21000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5617_21000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5617_21000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5617_21000_128_d0g1v0Filler.json
index aadf414f9..aadf414f9 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5617_21000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5617_21000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5617_21000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5617_21000_128_d0g2v0Filler.json
index 53680f587..53680f587 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5617_21000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5617_21000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5617_21000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5617_21000_128_d0g3v0Filler.json
index 48904d093..48904d093 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5617_21000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5617_21000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5617_21000_96_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5617_21000_96_d0g0v0Filler.json
index ee2811c81..ee2811c81 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5617_21000_96_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5617_21000_96_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5617_21000_96_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5617_21000_96_d0g1v0Filler.json
index 7d24f17d6..7d24f17d6 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5617_21000_96_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5617_21000_96_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5617_21000_96_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5617_21000_96_d0g2v0Filler.json
index 7a419a527..7a419a527 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5617_21000_96_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5617_21000_96_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5617_21000_96_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5617_21000_96_d0g3v0Filler.json
index 71bd9d8f0..71bd9d8f0 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5617_21000_96_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5617_21000_96_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5617_28000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5617_28000_128_d0g0v0Filler.json
index a3c34d0c4..a3c34d0c4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5617_28000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5617_28000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5617_28000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5617_28000_128_d0g1v0Filler.json
index d513995c8..d513995c8 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5617_28000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5617_28000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5617_28000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5617_28000_128_d0g2v0Filler.json
index 2a39e9241..2a39e9241 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5617_28000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5617_28000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5617_28000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5617_28000_128_d0g3v0Filler.json
index d530fbf87..d530fbf87 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5617_28000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5617_28000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5617_28000_96_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5617_28000_96_d0g0v0Filler.json
index ad42605e9..ad42605e9 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5617_28000_96_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5617_28000_96_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5617_28000_96_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5617_28000_96_d0g1v0Filler.json
index 1c0920751..1c0920751 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5617_28000_96_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5617_28000_96_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5617_28000_96_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5617_28000_96_d0g2v0Filler.json
index dd341858e..dd341858e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5617_28000_96_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5617_28000_96_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5617_28000_96_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5617_28000_96_d0g3v0Filler.json
index d1216d828..d1216d828 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_5617_28000_96_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_5617_28000_96_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9935_21000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9935_21000_128_d0g0v0Filler.json
index dc8ab0054..dc8ab0054 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9935_21000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9935_21000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9935_21000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9935_21000_128_d0g1v0Filler.json
index c3d6da2a8..c3d6da2a8 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9935_21000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9935_21000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9935_21000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9935_21000_128_d0g2v0Filler.json
index 2b9249a80..2b9249a80 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9935_21000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9935_21000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9935_21000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9935_21000_128_d0g3v0Filler.json
index c358da3cd..c358da3cd 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9935_21000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9935_21000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9935_21000_96_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9935_21000_96_d0g0v0Filler.json
index 1d81fcf62..1d81fcf62 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9935_21000_96_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9935_21000_96_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9935_21000_96_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9935_21000_96_d0g1v0Filler.json
index 82359f985..82359f985 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9935_21000_96_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9935_21000_96_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9935_21000_96_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9935_21000_96_d0g2v0Filler.json
index 06c91c6ed..06c91c6ed 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9935_21000_96_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9935_21000_96_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9935_21000_96_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9935_21000_96_d0g3v0Filler.json
index 5c462b12e..5c462b12e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9935_21000_96_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9935_21000_96_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9935_28000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9935_28000_128_d0g0v0Filler.json
index e4d8724e0..e4d8724e0 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9935_28000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9935_28000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9935_28000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9935_28000_128_d0g1v0Filler.json
index 1a21d5371..1a21d5371 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9935_28000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9935_28000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9935_28000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9935_28000_128_d0g2v0Filler.json
index a4cc3cf40..a4cc3cf40 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9935_28000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9935_28000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9935_28000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9935_28000_128_d0g3v0Filler.json
index 4f91ccda2..4f91ccda2 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9935_28000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9935_28000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9935_28000_96_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9935_28000_96_d0g0v0Filler.json
index 20c8c5236..20c8c5236 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9935_28000_96_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9935_28000_96_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9935_28000_96_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9935_28000_96_d0g1v0Filler.json
index e18631a75..e18631a75 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9935_28000_96_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9935_28000_96_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9935_28000_96_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9935_28000_96_d0g2v0Filler.json
index 724b3a20b..724b3a20b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9935_28000_96_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9935_28000_96_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9935_28000_96_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9935_28000_96_d0g3v0Filler.json
index 1a85f4fd4..1a85f4fd4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9935_28000_96_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9935_28000_96_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9_21000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9_21000_128_d0g0v0Filler.json
index fd215fa9e..fd215fa9e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9_21000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9_21000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9_21000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9_21000_128_d0g1v0Filler.json
index d80c2f77f..d80c2f77f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9_21000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9_21000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9_21000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9_21000_128_d0g2v0Filler.json
index 1e0bb8bdd..1e0bb8bdd 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9_21000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9_21000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9_21000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9_21000_128_d0g3v0Filler.json
index e2f960c62..e2f960c62 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9_21000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9_21000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9_21000_96_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9_21000_96_d0g0v0Filler.json
index feb30b4b5..feb30b4b5 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9_21000_96_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9_21000_96_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9_21000_96_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9_21000_96_d0g1v0Filler.json
index 30daea5df..30daea5df 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9_21000_96_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9_21000_96_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9_21000_96_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9_21000_96_d0g2v0Filler.json
index 74828f3df..74828f3df 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9_21000_96_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9_21000_96_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9_21000_96_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9_21000_96_d0g3v0Filler.json
index 40c88cb70..40c88cb70 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9_21000_96_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9_21000_96_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9_28000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9_28000_128_d0g0v0Filler.json
index 939f37aa0..939f37aa0 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9_28000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9_28000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9_28000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9_28000_128_d0g1v0Filler.json
index b613a0bed..b613a0bed 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9_28000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9_28000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9_28000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9_28000_128_d0g2v0Filler.json
index 0ea8f9bfd..0ea8f9bfd 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9_28000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9_28000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9_28000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9_28000_128_d0g3v0Filler.json
index f68d56667..f68d56667 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9_28000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9_28000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9_28000_96_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9_28000_96_d0g0v0Filler.json
index 53349d687..53349d687 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9_28000_96_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9_28000_96_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9_28000_96_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9_28000_96_d0g1v0Filler.json
index a9ee7cbe7..a9ee7cbe7 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9_28000_96_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9_28000_96_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9_28000_96_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9_28000_96_d0g2v0Filler.json
index 825ad2629..825ad2629 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9_28000_96_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9_28000_96_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9_28000_96_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9_28000_96_d0g3v0Filler.json
index 2142a27c2..2142a27c2 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-0_9_28000_96_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-0_9_28000_96_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_21000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_21000_128_d0g0v0Filler.json
index a90c4a2fd..a90c4a2fd 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_21000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_21000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_21000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_21000_128_d0g1v0Filler.json
index 93e5b5636..93e5b5636 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_21000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_21000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_21000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_21000_128_d0g2v0Filler.json
index 9a77a5f34..9a77a5f34 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_21000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_21000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_21000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_21000_128_d0g3v0Filler.json
index 783734b69..783734b69 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_21000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_21000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_21000_64_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_21000_64_d0g0v0Filler.json
index 858b8d4b6..858b8d4b6 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_21000_64_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_21000_64_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_21000_64_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_21000_64_d0g1v0Filler.json
index 7734f6100..7734f6100 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_21000_64_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_21000_64_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_21000_64_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_21000_64_d0g2v0Filler.json
index cad8232a4..cad8232a4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_21000_64_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_21000_64_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_21000_64_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_21000_64_d0g3v0Filler.json
index a1d93162d..a1d93162d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_21000_64_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_21000_64_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_21000_80_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_21000_80_d0g0v0Filler.json
index cda930f5d..cda930f5d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_21000_80_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_21000_80_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_21000_80_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_21000_80_d0g1v0Filler.json
index 87cc63e49..87cc63e49 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_21000_80_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_21000_80_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_21000_80_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_21000_80_d0g2v0Filler.json
index 2195176d5..2195176d5 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_21000_80_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_21000_80_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_21000_80_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_21000_80_d0g3v0Filler.json
index 03bca65d8..03bca65d8 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_21000_80_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_21000_80_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_21000_96_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_21000_96_d0g0v0Filler.json
index c1891a644..c1891a644 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_21000_96_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_21000_96_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_21000_96_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_21000_96_d0g1v0Filler.json
index 8230a709e..8230a709e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_21000_96_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_21000_96_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_21000_96_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_21000_96_d0g2v0Filler.json
index 26cbc4be3..26cbc4be3 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_21000_96_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_21000_96_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_21000_96_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_21000_96_d0g3v0Filler.json
index e652bc520..e652bc520 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_21000_96_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_21000_96_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_28000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_28000_128_d0g0v0Filler.json
index 6d1e81920..6d1e81920 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_28000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_28000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_28000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_28000_128_d0g1v0Filler.json
index b62a6ac21..b62a6ac21 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_28000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_28000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_28000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_28000_128_d0g2v0Filler.json
index b524c80d4..b524c80d4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_28000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_28000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_28000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_28000_128_d0g3v0Filler.json
index c3dca9eda..c3dca9eda 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_28000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_28000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_28000_64_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_28000_64_d0g0v0Filler.json
index 45a527cc6..45a527cc6 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_28000_64_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_28000_64_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_28000_64_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_28000_64_d0g1v0Filler.json
index 361834f69..361834f69 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_28000_64_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_28000_64_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_28000_64_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_28000_64_d0g2v0Filler.json
index 1dd7b0a04..1dd7b0a04 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_28000_64_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_28000_64_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_28000_64_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_28000_64_d0g3v0Filler.json
index 11171243f..11171243f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_28000_64_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_28000_64_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_28000_80_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_28000_80_d0g0v0Filler.json
index e2d07116f..e2d07116f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_28000_80_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_28000_80_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_28000_80_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_28000_80_d0g1v0Filler.json
index 08c0428df..08c0428df 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_28000_80_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_28000_80_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_28000_80_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_28000_80_d0g2v0Filler.json
index 61dd82f96..61dd82f96 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_28000_80_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_28000_80_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_28000_80_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_28000_80_d0g3v0Filler.json
index 8fc076334..8fc076334 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_28000_80_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_28000_80_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_28000_96_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_28000_96_d0g0v0Filler.json
index 98f3ffd16..98f3ffd16 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_28000_96_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_28000_96_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_28000_96_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_28000_96_d0g1v0Filler.json
index f84d128ca..f84d128ca 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_28000_96_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_28000_96_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_28000_96_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_28000_96_d0g2v0Filler.json
index bda2000c4..bda2000c4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_28000_96_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_28000_96_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_28000_96_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_28000_96_d0g3v0Filler.json
index 0663135f7..0663135f7 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_0_28000_96_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_0_28000_96_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_1_21000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_1_21000_128_d0g0v0Filler.json
index cad2a6d15..cad2a6d15 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_1_21000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_1_21000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_1_21000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_1_21000_128_d0g1v0Filler.json
index 289824689..289824689 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_1_21000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_1_21000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_1_21000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_1_21000_128_d0g2v0Filler.json
index 0e3e0d470..0e3e0d470 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_1_21000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_1_21000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_1_21000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_1_21000_128_d0g3v0Filler.json
index fddfa1a6c..fddfa1a6c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_1_21000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_1_21000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_1_21000_96_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_1_21000_96_d0g0v0Filler.json
index 4cd05c3d3..4cd05c3d3 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_1_21000_96_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_1_21000_96_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_1_21000_96_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_1_21000_96_d0g1v0Filler.json
index 404a5c142..404a5c142 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_1_21000_96_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_1_21000_96_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_1_21000_96_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_1_21000_96_d0g2v0Filler.json
index 6d3e72a9a..6d3e72a9a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_1_21000_96_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_1_21000_96_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_1_21000_96_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_1_21000_96_d0g3v0Filler.json
index c64c260f4..c64c260f4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_1_21000_96_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_1_21000_96_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_1_28000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_1_28000_128_d0g0v0Filler.json
index 663af37bf..663af37bf 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_1_28000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_1_28000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_1_28000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_1_28000_128_d0g1v0Filler.json
index cc2612ebf..cc2612ebf 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_1_28000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_1_28000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_1_28000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_1_28000_128_d0g2v0Filler.json
index f356bf8c0..f356bf8c0 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_1_28000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_1_28000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_1_28000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_1_28000_128_d0g3v0Filler.json
index 9ee794a8c..9ee794a8c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_1_28000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_1_28000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_1_28000_96_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_1_28000_96_d0g0v0Filler.json
index f777b00ba..f777b00ba 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_1_28000_96_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_1_28000_96_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_1_28000_96_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_1_28000_96_d0g1v0Filler.json
index 0a26cbcd9..0a26cbcd9 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_1_28000_96_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_1_28000_96_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_1_28000_96_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_1_28000_96_d0g2v0Filler.json
index a66cbc000..a66cbc000 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_1_28000_96_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_1_28000_96_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_1_28000_96_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_1_28000_96_d0g3v0Filler.json
index df85da138..df85da138 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_1_28000_96_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_1_28000_96_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_2_21000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_2_21000_128_d0g0v0Filler.json
index eeefb6ddb..eeefb6ddb 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_2_21000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_2_21000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_2_21000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_2_21000_128_d0g1v0Filler.json
index 8f26565e6..8f26565e6 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_2_21000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_2_21000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_2_21000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_2_21000_128_d0g2v0Filler.json
index 7a4d16b1f..7a4d16b1f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_2_21000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_2_21000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_2_21000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_2_21000_128_d0g3v0Filler.json
index b43ac806a..b43ac806a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_2_21000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_2_21000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_2_21000_96_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_2_21000_96_d0g0v0Filler.json
index 6acb98cfd..6acb98cfd 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_2_21000_96_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_2_21000_96_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_2_21000_96_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_2_21000_96_d0g1v0Filler.json
index edb57fd9a..edb57fd9a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_2_21000_96_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_2_21000_96_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_2_21000_96_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_2_21000_96_d0g2v0Filler.json
index 497f80883..497f80883 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_2_21000_96_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_2_21000_96_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_2_21000_96_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_2_21000_96_d0g3v0Filler.json
index f1d319f52..f1d319f52 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_2_21000_96_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_2_21000_96_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_2_28000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_2_28000_128_d0g0v0Filler.json
index 11671c7c4..11671c7c4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_2_28000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_2_28000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_2_28000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_2_28000_128_d0g1v0Filler.json
index 4b89aae0f..4b89aae0f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_2_28000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_2_28000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_2_28000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_2_28000_128_d0g2v0Filler.json
index 15078d056..15078d056 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_2_28000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_2_28000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_2_28000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_2_28000_128_d0g3v0Filler.json
index 30ae4db0b..30ae4db0b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_2_28000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_2_28000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_2_28000_96_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_2_28000_96_d0g0v0Filler.json
index 17afc8c28..17afc8c28 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_2_28000_96_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_2_28000_96_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_2_28000_96_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_2_28000_96_d0g1v0Filler.json
index ef0441c6d..ef0441c6d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_2_28000_96_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_2_28000_96_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_2_28000_96_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_2_28000_96_d0g2v0Filler.json
index 042959cfd..042959cfd 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_2_28000_96_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_2_28000_96_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_2_28000_96_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_2_28000_96_d0g3v0Filler.json
index cbba23a30..cbba23a30 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_2_28000_96_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_2_28000_96_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_128_d0g0v0Filler.json
index 901e6ac4f..901e6ac4f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_128_d0g1v0Filler.json
index 5ad285cbd..5ad285cbd 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_128_d0g2v0Filler.json
index bb8ba515c..bb8ba515c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_128_d0g3v0Filler.json
index e2a366993..e2a366993 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_80_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_80_d0g0v0Filler.json
index 47803cd02..47803cd02 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_80_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_80_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_80_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_80_d0g1v0Filler.json
index 2841d3d0d..2841d3d0d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_80_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_80_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_80_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_80_d0g2v0Filler.json
index 681cfb449..681cfb449 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_80_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_80_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_80_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_80_d0g3v0Filler.json
index 517ebf717..517ebf717 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_80_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_80_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_96_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_96_d0g0v0Filler.json
index 9c425976c..9c425976c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_96_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_96_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_96_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_96_d0g1v0Filler.json
index f6769a691..f6769a691 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_96_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_96_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_96_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_96_d0g2v0Filler.json
index 34b979f1b..34b979f1b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_96_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_96_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_96_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_96_d0g3v0Filler.json
index 0532cadd4..0532cadd4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_96_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_96_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_128_d0g0v0Filler.json
index 4d02926d6..4d02926d6 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_128_d0g1v0Filler.json
index 2e219372c..2e219372c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_128_d0g2v0Filler.json
index 1e599b09c..1e599b09c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_128_d0g3v0Filler.json
index 891fd0303..891fd0303 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_80_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_80_d0g0v0Filler.json
index 04e8496f3..04e8496f3 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_80_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_80_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_80_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_80_d0g1v0Filler.json
index 829e063ec..829e063ec 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_80_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_80_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_80_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_80_d0g2v0Filler.json
index 77921572b..77921572b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_80_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_80_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_80_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_80_d0g3v0Filler.json
index da7b42385..da7b42385 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_80_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_80_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_96_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_96_d0g0v0Filler.json
index 9fc0fad4c..9fc0fad4c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_96_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_96_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_96_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_96_d0g1v0Filler.json
index 4596b7fd6..4596b7fd6 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_96_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_96_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_96_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_96_d0g2v0Filler.json
index fd7ce0b3e..fd7ce0b3e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_96_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_96_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_96_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_96_d0g3v0Filler.json
index 1e2582e5f..1e2582e5f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_96_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_96_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5616_21000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_21000_128_d0g0v0Filler.json
index 4bb8e4570..4bb8e4570 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5616_21000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_21000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5616_21000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_21000_128_d0g1v0Filler.json
index da861e1e2..da861e1e2 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5616_21000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_21000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5616_21000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_21000_128_d0g2v0Filler.json
index 26983bfae..26983bfae 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5616_21000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_21000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5616_21000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_21000_128_d0g3v0Filler.json
index dedfe0c32..dedfe0c32 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5616_21000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_21000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5616_21000_96_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_21000_96_d0g0v0Filler.json
index 8ff07d995..8ff07d995 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5616_21000_96_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_21000_96_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5616_21000_96_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_21000_96_d0g1v0Filler.json
index 7af2c4974..7af2c4974 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5616_21000_96_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_21000_96_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5616_21000_96_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_21000_96_d0g2v0Filler.json
index 8ba9c3833..8ba9c3833 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5616_21000_96_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_21000_96_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5616_21000_96_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_21000_96_d0g3v0Filler.json
index 4d063dc26..4d063dc26 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5616_21000_96_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_21000_96_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5616_28000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_28000_128_d0g0v0Filler.json
index b9d4ee70b..b9d4ee70b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5616_28000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_28000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5616_28000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_28000_128_d0g1v0Filler.json
index e59cf4c2e..e59cf4c2e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5616_28000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_28000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5616_28000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_28000_128_d0g2v0Filler.json
index b503060c2..b503060c2 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5616_28000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_28000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5616_28000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_28000_128_d0g3v0Filler.json
index 921a21375..921a21375 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5616_28000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_28000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5616_28000_96_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_28000_96_d0g0v0Filler.json
index 8be1d9e5f..8be1d9e5f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5616_28000_96_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_28000_96_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5616_28000_96_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_28000_96_d0g1v0Filler.json
index 15043b820..15043b820 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5616_28000_96_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_28000_96_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5616_28000_96_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_28000_96_d0g2v0Filler.json
index 71d171ed5..71d171ed5 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5616_28000_96_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_28000_96_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5616_28000_96_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_28000_96_d0g3v0Filler.json
index 97f24239e..97f24239e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5616_28000_96_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5616_28000_96_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5617_21000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5617_21000_128_d0g0v0Filler.json
index cafb0efb7..cafb0efb7 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5617_21000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5617_21000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5617_21000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5617_21000_128_d0g1v0Filler.json
index 6d34f239c..6d34f239c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5617_21000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5617_21000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5617_21000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5617_21000_128_d0g2v0Filler.json
index b776fcead..b776fcead 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5617_21000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5617_21000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5617_21000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5617_21000_128_d0g3v0Filler.json
index 3aea6bd95..3aea6bd95 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5617_21000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5617_21000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5617_21000_96_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5617_21000_96_d0g0v0Filler.json
index b1b00e921..b1b00e921 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5617_21000_96_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5617_21000_96_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5617_21000_96_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5617_21000_96_d0g1v0Filler.json
index 64f14a086..64f14a086 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5617_21000_96_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5617_21000_96_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5617_21000_96_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5617_21000_96_d0g2v0Filler.json
index 02ffab115..02ffab115 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5617_21000_96_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5617_21000_96_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5617_21000_96_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5617_21000_96_d0g3v0Filler.json
index 2cb69675d..2cb69675d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5617_21000_96_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5617_21000_96_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5617_28000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5617_28000_128_d0g0v0Filler.json
index 086dfc0b8..086dfc0b8 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5617_28000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5617_28000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5617_28000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5617_28000_128_d0g1v0Filler.json
index c73c529f4..c73c529f4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5617_28000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5617_28000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5617_28000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5617_28000_128_d0g2v0Filler.json
index 32534e04f..32534e04f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5617_28000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5617_28000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5617_28000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5617_28000_128_d0g3v0Filler.json
index 3d8badcd8..3d8badcd8 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5617_28000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5617_28000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5617_28000_96_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5617_28000_96_d0g0v0Filler.json
index c051f7497..c051f7497 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5617_28000_96_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5617_28000_96_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5617_28000_96_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5617_28000_96_d0g1v0Filler.json
index 8bc8f68f3..8bc8f68f3 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5617_28000_96_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5617_28000_96_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5617_28000_96_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5617_28000_96_d0g2v0Filler.json
index 3a9c51a64..3a9c51a64 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5617_28000_96_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5617_28000_96_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5617_28000_96_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5617_28000_96_d0g3v0Filler.json
index aa1454375..aa1454375 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_5617_28000_96_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_5617_28000_96_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9935_21000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9935_21000_128_d0g0v0Filler.json
index 3ea0444f5..3ea0444f5 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9935_21000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9935_21000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9935_21000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9935_21000_128_d0g1v0Filler.json
index 834e72526..834e72526 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9935_21000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9935_21000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9935_21000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9935_21000_128_d0g2v0Filler.json
index 4dc1ba485..4dc1ba485 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9935_21000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9935_21000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9935_21000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9935_21000_128_d0g3v0Filler.json
index b5d0dfcbd..b5d0dfcbd 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9935_21000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9935_21000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9935_21000_96_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9935_21000_96_d0g0v0Filler.json
index 029ef7902..029ef7902 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9935_21000_96_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9935_21000_96_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9935_21000_96_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9935_21000_96_d0g1v0Filler.json
index f7114dce8..f7114dce8 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9935_21000_96_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9935_21000_96_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9935_21000_96_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9935_21000_96_d0g2v0Filler.json
index b5bde461f..b5bde461f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9935_21000_96_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9935_21000_96_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9935_21000_96_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9935_21000_96_d0g3v0Filler.json
index 0192efae4..0192efae4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9935_21000_96_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9935_21000_96_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9935_28000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9935_28000_128_d0g0v0Filler.json
index 8442f881a..8442f881a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9935_28000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9935_28000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9935_28000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9935_28000_128_d0g1v0Filler.json
index f831ddf47..f831ddf47 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9935_28000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9935_28000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9935_28000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9935_28000_128_d0g2v0Filler.json
index 0af045765..0af045765 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9935_28000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9935_28000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9935_28000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9935_28000_128_d0g3v0Filler.json
index 40435786f..40435786f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9935_28000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9935_28000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9935_28000_96_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9935_28000_96_d0g0v0Filler.json
index 73d205118..73d205118 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9935_28000_96_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9935_28000_96_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9935_28000_96_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9935_28000_96_d0g1v0Filler.json
index 5c161365f..5c161365f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9935_28000_96_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9935_28000_96_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9935_28000_96_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9935_28000_96_d0g2v0Filler.json
index 0eb5f83c1..0eb5f83c1 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9935_28000_96_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9935_28000_96_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9935_28000_96_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9935_28000_96_d0g3v0Filler.json
index 354329266..354329266 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9935_28000_96_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9935_28000_96_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9_21000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9_21000_128_d0g0v0Filler.json
index 477b0ad1e..477b0ad1e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9_21000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9_21000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9_21000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9_21000_128_d0g1v0Filler.json
index 4c20f9e9e..4c20f9e9e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9_21000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9_21000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9_21000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9_21000_128_d0g2v0Filler.json
index 48d59e0fb..48d59e0fb 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9_21000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9_21000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9_21000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9_21000_128_d0g3v0Filler.json
index 62a79da95..62a79da95 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9_21000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9_21000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9_21000_96_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9_21000_96_d0g0v0Filler.json
index 7de5885b1..7de5885b1 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9_21000_96_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9_21000_96_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9_21000_96_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9_21000_96_d0g1v0Filler.json
index 187455387..187455387 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9_21000_96_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9_21000_96_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9_21000_96_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9_21000_96_d0g2v0Filler.json
index d30697d6b..d30697d6b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9_21000_96_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9_21000_96_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9_21000_96_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9_21000_96_d0g3v0Filler.json
index c2a697101..c2a697101 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9_21000_96_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9_21000_96_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9_28000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9_28000_128_d0g0v0Filler.json
index 5a7dbe8f8..5a7dbe8f8 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9_28000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9_28000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9_28000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9_28000_128_d0g1v0Filler.json
index 898073de3..898073de3 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9_28000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9_28000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9_28000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9_28000_128_d0g2v0Filler.json
index be5174671..be5174671 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9_28000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9_28000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9_28000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9_28000_128_d0g3v0Filler.json
index ec8fbfde9..ec8fbfde9 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9_28000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9_28000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9_28000_96_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9_28000_96_d0g0v0Filler.json
index c3b44613f..c3b44613f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9_28000_96_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9_28000_96_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9_28000_96_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9_28000_96_d0g1v0Filler.json
index 383226a44..383226a44 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9_28000_96_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9_28000_96_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9_28000_96_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9_28000_96_d0g2v0Filler.json
index 9dc5230be..9dc5230be 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9_28000_96_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9_28000_96_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9_28000_96_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9_28000_96_d0g3v0Filler.json
index 13ef137aa..13ef137aa 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_0-3_9_28000_96_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_0-3_9_28000_96_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_21000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_21000_128_d0g0v0Filler.json
index 2dd79a4d5..2dd79a4d5 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_21000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_21000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_21000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_21000_128_d0g1v0Filler.json
index 4ba9924d6..4ba9924d6 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_21000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_21000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_21000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_21000_128_d0g2v0Filler.json
index 0fac48a7d..0fac48a7d 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_21000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_21000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_21000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_21000_128_d0g3v0Filler.json
index 32587eae9..32587eae9 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_21000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_21000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_21000_64_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_21000_64_d0g0v0Filler.json
index 17fda6ad0..17fda6ad0 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_21000_64_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_21000_64_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_21000_64_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_21000_64_d0g1v0Filler.json
index 3679fe033..3679fe033 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_21000_64_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_21000_64_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_21000_64_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_21000_64_d0g2v0Filler.json
index 34a7bd19e..34a7bd19e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_21000_64_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_21000_64_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_21000_64_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_21000_64_d0g3v0Filler.json
index 8502df6d1..8502df6d1 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_21000_64_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_21000_64_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_21000_80_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_21000_80_d0g0v0Filler.json
index 06077db42..06077db42 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_21000_80_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_21000_80_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_21000_80_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_21000_80_d0g1v0Filler.json
index 0c91338d5..0c91338d5 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_21000_80_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_21000_80_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_21000_80_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_21000_80_d0g2v0Filler.json
index 443b29cf4..443b29cf4 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_21000_80_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_21000_80_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_21000_80_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_21000_80_d0g3v0Filler.json
index 4688daeba..4688daeba 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_21000_80_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_21000_80_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_21000_96_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_21000_96_d0g0v0Filler.json
index 42475ae5c..42475ae5c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_21000_96_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_21000_96_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_21000_96_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_21000_96_d0g1v0Filler.json
index 71d2c0778..71d2c0778 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_21000_96_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_21000_96_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_21000_96_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_21000_96_d0g2v0Filler.json
index bf3aea2af..bf3aea2af 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_21000_96_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_21000_96_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_21000_96_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_21000_96_d0g3v0Filler.json
index b466fba95..b466fba95 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_21000_96_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_21000_96_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_28000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_28000_128_d0g0v0Filler.json
index 103991695..103991695 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_28000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_28000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_28000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_28000_128_d0g1v0Filler.json
index d3708563c..d3708563c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_28000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_28000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_28000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_28000_128_d0g2v0Filler.json
index 2e1d049ad..2e1d049ad 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_28000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_28000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_28000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_28000_128_d0g3v0Filler.json
index fe98e747b..fe98e747b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_28000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_28000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_28000_64_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_28000_64_d0g0v0Filler.json
index 9f6d8da75..9f6d8da75 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_28000_64_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_28000_64_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_28000_64_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_28000_64_d0g1v0Filler.json
index 258026287..258026287 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_28000_64_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_28000_64_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_28000_64_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_28000_64_d0g2v0Filler.json
index 306f74672..306f74672 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_28000_64_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_28000_64_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_28000_64_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_28000_64_d0g3v0Filler.json
index b04dc11da..b04dc11da 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_28000_64_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_28000_64_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_28000_80_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_28000_80_d0g0v0Filler.json
index 452427904..452427904 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_28000_80_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_28000_80_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_28000_80_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_28000_80_d0g1v0Filler.json
index 8dcd672b8..8dcd672b8 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_28000_80_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_28000_80_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_28000_80_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_28000_80_d0g2v0Filler.json
index 316f45d44..316f45d44 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_28000_80_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_28000_80_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_28000_80_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_28000_80_d0g3v0Filler.json
index 8d80f1e95..8d80f1e95 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_28000_80_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_28000_80_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_28000_96_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_28000_96_d0g0v0Filler.json
index b015f76d3..b015f76d3 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_28000_96_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_28000_96_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_28000_96_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_28000_96_d0g1v0Filler.json
index f4d5f6054..f4d5f6054 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_28000_96_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_28000_96_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_28000_96_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_28000_96_d0g2v0Filler.json
index fd9107b69..fd9107b69 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_28000_96_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_28000_96_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_28000_96_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_28000_96_d0g3v0Filler.json
index 7630ec33a..7630ec33a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_0_28000_96_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_0_28000_96_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_1_21000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_1_21000_128_d0g0v0Filler.json
index 89c1d45ef..89c1d45ef 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_1_21000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_1_21000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_1_21000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_1_21000_128_d0g1v0Filler.json
index 3cdd539d7..3cdd539d7 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_1_21000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_1_21000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_1_21000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_1_21000_128_d0g2v0Filler.json
index 183f7a9e6..183f7a9e6 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_1_21000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_1_21000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_1_21000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_1_21000_128_d0g3v0Filler.json
index abed73593..abed73593 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_1_21000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_1_21000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_1_21000_96_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_1_21000_96_d0g0v0Filler.json
index 4a71dc393..4a71dc393 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_1_21000_96_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_1_21000_96_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_1_21000_96_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_1_21000_96_d0g1v0Filler.json
index 72cc088eb..72cc088eb 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_1_21000_96_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_1_21000_96_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_1_21000_96_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_1_21000_96_d0g2v0Filler.json
index 70e7aca67..70e7aca67 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_1_21000_96_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_1_21000_96_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_1_21000_96_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_1_21000_96_d0g3v0Filler.json
index 0f974122b..0f974122b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_1_21000_96_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_1_21000_96_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_1_28000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_1_28000_128_d0g0v0Filler.json
index 38958cb51..38958cb51 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_1_28000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_1_28000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_1_28000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_1_28000_128_d0g1v0Filler.json
index c79f30c71..c79f30c71 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_1_28000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_1_28000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_1_28000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_1_28000_128_d0g2v0Filler.json
index 1eafa725f..1eafa725f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_1_28000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_1_28000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_1_28000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_1_28000_128_d0g3v0Filler.json
index 244d50838..244d50838 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_1_28000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_1_28000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_1_28000_96_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_1_28000_96_d0g0v0Filler.json
index c2c3c2c15..c2c3c2c15 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_1_28000_96_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_1_28000_96_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_1_28000_96_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_1_28000_96_d0g1v0Filler.json
index cc57a16b2..cc57a16b2 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_1_28000_96_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_1_28000_96_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_1_28000_96_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_1_28000_96_d0g2v0Filler.json
index 9775cc3d1..9775cc3d1 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_1_28000_96_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_1_28000_96_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_1_28000_96_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_1_28000_96_d0g3v0Filler.json
index 37c52d9de..37c52d9de 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_1_28000_96_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_1_28000_96_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_2_21000_128_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_2_21000_128_d0g0v0Filler.json
index 28cd65251..28cd65251 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_2_21000_128_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_2_21000_128_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_2_21000_128_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_2_21000_128_d0g1v0Filler.json
index da048eb0a..da048eb0a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_2_21000_128_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_2_21000_128_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_2_21000_128_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_2_21000_128_d0g2v0Filler.json
index 1f5c24584..1f5c24584 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_2_21000_128_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_2_21000_128_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_2_21000_128_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_2_21000_128_d0g3v0Filler.json
index 902d33c6e..902d33c6e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_2_21000_128_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_2_21000_128_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_2_21000_96_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_2_21000_96_d0g0v0Filler.json
index b4c732d11..b4c732d11 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_2_21000_96_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_2_21000_96_d0g0v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_2_21000_96_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_2_21000_96_d0g1v0Filler.json
index fbbbd0054..fbbbd0054 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_2_21000_96_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_2_21000_96_d0g1v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_2_21000_96_d0g2v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_2_21000_96_d0g2v0Filler.json
index 0b7e90407..0b7e90407 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_2_21000_96_d0g2v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_2_21000_96_d0g2v0Filler.json
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_2_21000_96_d0g3v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_2_21000_96_d0g3v0Filler.json
index 19efd8ba1..19efd8ba1 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge/ecmul_1-2_2_21000_96_d0g3v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stZeroKnowledge2/ecmul_1-2_2_21000_96_d0g3v0Filler.json
diff --git a/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToDao/DaoTransactionsFiller.json b/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToDao/DaoTransactionsFiller.json
index 9a4c05c8d..b8b1991ce 100644
--- a/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToDao/DaoTransactionsFiller.json
+++ b/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToDao/DaoTransactionsFiller.json
@@ -1,6 +1,8 @@
 {
     "DaoTransactions" : {
-	"comment" : "This test checks DAO hardfork transition at block 5. According to specification given list of accounts L from the prestate (except a94f5374fce5edbc8e2a8697c15331677e6ebf0b (caller)) should transfer it's balance at the begining of the block 5 to contract C = bf4ed7b27f1d666546e30d74d50d173d20bca754. Then all blocks from 5 to 14(included) must have extradata set to 0x64616f2d686172642d666f726b otherwise blocks considered incorrect. Additionally all uncles with numbers from 5 to 14(included) in this blocks should corespond to extradata requirenmets.",
+        "_info" : {
+            "comment" : "This test checks DAO hardfork transition at block 5. According to specification given list of accounts L from the prestate (except a94f5374fce5edbc8e2a8697c15331677e6ebf0b (caller)) should transfer it's balance at the begining of the block 5 to contract C = bf4ed7b27f1d666546e30d74d50d173d20bca754. Then all blocks from 5 to 14(included) must have extradata set to 0x64616f2d686172642d666f726b otherwise blocks considered incorrect. Additionally all uncles with numbers from 5 to 14(included) in this blocks should corespond to extradata requirenmets."
+        },
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
@@ -339,9 +341,9 @@
                 "uncleHeaders" : [
                 ]
             },
-	    {
-		"acomment" : "check balance of one of the accounts from L at 7 block",
-		"blocknumber" : "4",
+            {
+                "//comment" : "check balance of one of the accounts from L at 7 block",
+                "blocknumber" : "4",
                 "transactions" : [
                     {
                         "data" : "",
@@ -373,12 +375,12 @@
                 "uncleHeaders" : [
                 ]
             },
-	    {
-		"acomment" : "check balance of one of the accounts from L at block 8",
-		"blocknumber" : "5",
-		"blockHeaderPremine" : {
+            {
+                "//comment" : "check balance of one of the accounts from L at block 8",
+                "blocknumber" : "5",
+                "blockHeaderPremine" : {
                     "extraData" : "0x64616f2d686172642d666f726b",
-		    "updatePoW" : "1"
+                    "updatePoW" : "1"
                 },
                 "transactions" : [
                     {
@@ -394,11 +396,11 @@
                 "uncleHeaders" : [
                 ]
             },
-	    {
-		"blocknumber" : "6",
-		"expectExceptionALL" : "InvalidTransactionsRoot",
+            {
+                "blocknumber" : "6",
+                "expectExceptionALL" : "InvalidTransactionsRoot",
                 "transactions" : [
-                    {
+                     {
                         "data" : "",
                         "gasLimit" : "60000",
                         "gasPrice" : "1",
diff --git a/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToDao/DaoTransactions_EmptyTransactionAndForkBlocksAheadFiller.json b/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToDao/DaoTransactions_EmptyTransactionAndForkBlocksAheadFiller.json
index 96581bd84..41e5fe3d5 100644
--- a/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToDao/DaoTransactions_EmptyTransactionAndForkBlocksAheadFiller.json
+++ b/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToDao/DaoTransactions_EmptyTransactionAndForkBlocksAheadFiller.json
@@ -1,6 +1,8 @@
 {
     "DaoTransactions_EmptyTransactionAndForkBlocksAhead" : {
-	"acomment" : "This test checks DAO hardfork transition at block 5. According to specification given list of accounts L from the prestate (except a94f5374fce5edbc8e2a8697c15331677e6ebf0b (caller)) should transfer it's balance at the begining of the block 5 to contract C = bf4ed7b27f1d666546e30d74d50d173d20bca754. Then all blocks from 5 to 14(included) must have extradata set to 0x64616f2d686172642d666f726b otherwise blocks considered incorrect. Additionally all uncles with numbers from 5 to 14(included) in this blocks should corespond to extradata requirenmets.",
+        "_info" : {
+            "comment" : "This test checks DAO hardfork transition at block 5. According to specification given list of accounts L from the prestate (except a94f5374fce5edbc8e2a8697c15331677e6ebf0b (caller)) should transfer it's balance at the begining of the block 5 to contract C = bf4ed7b27f1d666546e30d74d50d173d20bca754. Then all blocks from 5 to 14(included) must have extradata set to 0x64616f2d686172642d666f726b otherwise blocks considered incorrect. Additionally all uncles with numbers from 5 to 14(included) in this blocks should corespond to extradata requirenmets."
+        },
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
diff --git a/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToDao/DaoTransactions_UncleExtradataFiller.json b/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToDao/DaoTransactions_UncleExtradataFiller.json
index 85ae657e9..243abacc5 100644
--- a/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToDao/DaoTransactions_UncleExtradataFiller.json
+++ b/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToDao/DaoTransactions_UncleExtradataFiller.json
@@ -1,6 +1,8 @@
 {
     "DaoTransactions_UncleExtradata" : {
-	"acomment" : "This test checks DAO hardfork transition at block 5. According to specification given list of accounts L from the prestate (except a94f5374fce5edbc8e2a8697c15331677e6ebf0b (caller)) should transfer it's balance at the begining of the block 5 to contract C = bf4ed7b27f1d666546e30d74d50d173d20bca754. Then all blocks from 5 to 14(included) must have extradata set to 0x64616f2d686172642d666f726b otherwise blocks considered incorrect. Additionally all uncles with numbers from 5 to 14(included) in this blocks should corespond to extradata requirenmets.",
+        "_info" : {
+            "comment" : "This test checks DAO hardfork transition at block 5. According to specification given list of accounts L from the prestate (except a94f5374fce5edbc8e2a8697c15331677e6ebf0b (caller)) should transfer it's balance at the begining of the block 5 to contract C = bf4ed7b27f1d666546e30d74d50d173d20bca754. Then all blocks from 5 to 14(included) must have extradata set to 0x64616f2d686172642d666f726b otherwise blocks considered incorrect. Additionally all uncles with numbers from 5 to 14(included) in this blocks should corespond to extradata requirenmets."
+        },
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
diff --git a/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToDao/DaoTransactions_XBlockm1Filler.json b/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToDao/DaoTransactions_XBlockm1Filler.json
index 24097766f..233af1b04 100644
--- a/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToDao/DaoTransactions_XBlockm1Filler.json
+++ b/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToDao/DaoTransactions_XBlockm1Filler.json
@@ -1,6 +1,8 @@
 {
     "DaoTransactions_XBlockm1" : {
-	"acomment" : "This test checks that DAO hardfork transition does not occur at the end of block 4",
+        "_info" : {
+            "comment" : "This test checks that DAO hardfork transition does not occur at the end of block 4"
+        },
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "0x8888f1f195afa192cfee860698584c030f4c9db1",
diff --git a/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToEIP150/EIP150TransitionFiller.json b/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToEIP150/EIP150TransitionFiller.json
index 0b9c1f457..b9b16be37 100644
--- a/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToEIP150/EIP150TransitionFiller.json
+++ b/src/BlockchainTestsFiller/TransitionTests/bcHomesteadToEIP150/EIP150TransitionFiller.json
@@ -192,10 +192,10 @@
                 "shouldnotexist" : "1"
             },
 	    "1000000000000000000000000000000000000012" : {
-		"shoulsnotexist" : "1"
+		"shouldnotexist" : "1"
 	    },
 	    "1000000000000000000000000000000000000013" : {
-		"shoulsnotexist" : "1"
+		"shouldnotexist" : "1"
 	    },
             "5dddfce53ee040d9eb21afbc0ae1bb4dbb0ba643" : {
                 "storage" : {
@@ -542,7 +542,7 @@
                 ]
             },
 	    {
-		"comment" : "EIP150 rules are applied",
+        "//comment" : "EIP150 rules are applied",
 		"blocknumber" : "5",
 		"transactions" : [
 		    {
diff --git a/src/BlockchainTestsFiller/bcExploitTest/DelegateCallSpamFiller.json b/src/BlockchainTestsFiller/bcExploitTest/DelegateCallSpamFiller.json
index 61f851c1a..e1a8179a7 100644
--- a/src/BlockchainTestsFiller/bcExploitTest/DelegateCallSpamFiller.json
+++ b/src/BlockchainTestsFiller/bcExploitTest/DelegateCallSpamFiller.json
@@ -42,7 +42,7 @@
         "pre" : {
 	    "1000000000000000000000000000000000000001" : {
                 "balance" : "0",
-		"comment" : "A legit solidity contract",
+                "//comment" : "A legit solidity contract",
                 "code" : "0x6060604052361561020e5760e060020a6000350463013cf08b8114610247578063095ea7b3146102d05780630c3b7b96146103455780630e7082031461034e578063149acf9a1461036057806318160ddd146103725780631f2dc5ef1461037b57806321b5b8dd1461039b578063237e9492146103ad57806323b872dd1461040e5780632632bf2014610441578063341458081461047257806339d1f9081461047b5780634b6753bc146104935780634df6d6cc1461049c5780634e10c3ee146104b7578063590e1ae3146104ca578063612e45a3146104db578063643f7cdd1461057a578063674ed066146105925780636837ff1e1461059b57806370a08231146105e5578063749f98891461060b57806378524b2e1461062457806381f03fcb1461067e57806382661dc41461069657806382bf6464146106b75780638b15a605146106c95780638d7af473146106d257806396d7f3f5146106e1578063a1da2fb9146106ea578063a3912ec814610704578063a9059cbb1461070f578063b7bc2c841461073f578063baac53001461074b578063be7c29c1146107b1578063c9d27afe14610817578063cc9ae3f61461082d578063cdef91d014610841578063dbde198814610859578063dd62ed3e1461087e578063e33734fd146108b2578063e5962195146108c6578063e66f53b7146108de578063eceb2945146108f0578063f8c80d261461094f575b610966600f546000906234bc000142108015610239575060125433600160a060020a03908116911614155b156109785761098033610752565b6109866004356000805482908110156100025750808052600e8202600080516020612a3683398151915201905060038101546004820154600683015460018401548454600786015460058701546009880154600a890154600d8a0154600160a060020a039586169b509599600201989760ff81811698610100909204811697949691951693168c565b61096660043560243533600160a060020a03908116600081815260156020908152604080832094871680845294825280832086905580518681529051929493927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a35060015b92915050565b61096660105481565b610a7d600754600160a060020a031681565b610a7d600e54600160a060020a031681565b61096660165481565b6109665b60004262127500600f60005054031115610de557506014610983565b610a7d601254600160a060020a031681565b60408051602060248035600481810135601f810185900485028601850190965285855261096695813595919460449492939092019181908401838280828437509496505050505050506000600060006000600060003411156116a857610002565b6109666004356024356044355b60115460009060ff1680156104315750600f5442115b80156124e957506124e78461044b565b6109666000610980335b600160a060020a0381166000908152600b602052604081205481908114156129cb57610b99565b61096660065481565b6109665b600d5430600160a060020a03163103610983565b610966600f5481565b61096660043560046020526000908152604090205460ff1681565b61096660043560243560006124cb610831565b610a9a6000341115610ba457610002565b604080516020604435600481810135601f8101849004840285018401909552848452610966948135946024803595939460649492939101918190840183828082843750506040805160209735808a0135601f81018a90048a0283018a01909352828252969897608497919650602491909101945090925082915084018382808284375094965050933593505060a435915050600060006110c1336105ec565b61096660043560096020526000908152604090205481565b61096660015481565b610a9a60043530600160a060020a031633600160a060020a03161415806105db5750600160a060020a03811660009081526004602052604090205460ff16155b156121cb576121c8565b6109666004355b600160a060020a0381166000908152601460205260409020545b919050565b6109666004356024356000600034111561259957610002565b610966600062e6b680420360026000505410806106505750600354600160a060020a0390811633909116145b80156106645750600254621274ff19420190105b156126145750426002908155600180549091028155610983565b610966600435600a6020526000908152604090205481565b610966600435602435600060006000600060006000341115611ba157610002565b610a7d600854600160a060020a031681565b610966600c5481565b61096660005460001901610983565b61096660025481565b61096660043560006000600060003411156121fc57610002565b6109665b6001610983565b6109666004356024355b60115460009060ff16801561072f5750600f5442115b801561248757506124853361044b565b61096660115460ff1681565b6109666004355b60006000600f600050544210801561076a5750600034115b80156107a457506011546101009004600160a060020a0316600014806107a457506011546101009004600160a060020a0390811633909116145b15610b9f57610a9c61037f565b610a7d600435600060006000508281548110156100025750508080527f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e56b600e83020180548290811015610002575081526020902060030154600160a060020a0316610606565b61096660043560243560006000610e1b336105ec565b6109665b6000600034111561247c57610002565b61096660043560056020526000908152604090205481565b610966600435602435604435600061252f845b6000600060003411156127ac57610002565b610966600435602435600160a060020a0382811660009081526015602090815260408083209385168352929052205461033f565b610a9a600435600034111561254557610002565b610966600435600b6020526000908152604090205481565b610a7d600354600160a060020a031681565b604080516020606435600481810135601f81018490048402850184019095528484526109669481359460248035956044359560849492019190819084018382808284375094965050505050505060006000600034111561103257610002565b610a7d6011546101009004600160a060020a031681565b60408051918252519081900360200190f35b610980610708565b90505b90565b604051808d600160a060020a031681526020018c8152602001806020018b81526020018a815260200189815260200188815260200187815260200186815260200185815260200184815260200183600160a060020a0316815260200182810382528c818154600181600116156101000203166002900481526020019150805460018160011615610100020316600290048015610a635780601f10610a3857610100808354040283529160200191610a63565b820191906000526020600020905b815481529060010190602001808311610a4657829003601f168201915b50509d505050505050505050505050505060405180910390f35b60408051600160a060020a03929092168252519081900360200190f35b005b604051601254601434908102939093049350600160a060020a03169183900390600081818185876185025a03f150505050600160a060020a038316600081815260146020908152604080832080548601905560168054860190556013825291829020805434019055815184815291517fdbccb92686efceafb9bb7e0394df7f58f71b954061b81afb57109bf247d3d75a9281900390910190a260105460165410801590610b4c575060115460ff16155b15610b94576011805460ff1916600117905560165460408051918252517ff381a3e2428fdda36615919e8d9c35878d9eb0cf85ac6edf575088e80e4c147e9181900360200190a15b600191505b50919050565b610002565b600f5442118015610bb8575060115460ff16155b15610de357601260009054906101000a9004600160a060020a0316600160a060020a031663d2cc718f6040518160e060020a0281526004018090506020604051808303816000876161da5a03f1156100025750506040516012549051600160a060020a039190911631109050610cc9576040805160125460e060020a63d2cc718f0282529151600160a060020a039290921691630221038a913091849163d2cc718f91600482810192602092919082900301816000876161da5a03f11561000257505060408051805160e160020a63011081c5028252600160a060020a039490941660048201526024810193909352516044838101936020935082900301816000876161da5a03f115610002575050505b33600160a060020a0316600081815260136020526040808220549051909181818185876185025a03f19250505015610de35733600160a060020a03167fbb28353e4598c3b9199101a66e0989549b659a59a54d2c27fbb183f1932c8e6d6013600050600033600160a060020a03168152602001908152602001600020600050546040518082815260200191505060405180910390a26014600050600033600160a060020a0316815260200190815260200160002060005054601660008282825054039250508190555060006014600050600033600160a060020a031681526020019081526020016000206000508190555060006013600050600033600160a060020a03168152602001908152602001600020600050819055505b565b4262054600600f60005054031115610e13576201518062127500600f60005054034203046014019050610983565b50601e610983565b60001415610e2857610002565b6000341115610e3657610002565b6000805485908110156100025750600160a060020a03331681527f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e56e600e8602908101602052604090912054600080516020612a3683398151915291909101915060ff1680610eb05750600c810160205260406000205460ff165b80610ebf575060038101544210155b15610ec957610002565b8215610f0f5733600160a060020a03166000908152601460209081526040808320546009850180549091019055600b84019091529020805460ff19166001179055610f4b565b33600160a060020a0316600090815260146020908152604080832054600a850180549091019055600c84019091529020805460ff191660011790555b33600160a060020a03166000908152600b60205260408120541415610f77576040600020849055610feb565b33600160a060020a03166000908152600b60205260408120548154811015610002579080527f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e566600e909102015460038201541115610feb5733600160a060020a03166000908152600b602052604090208490555b60408051848152905133600160a060020a03169186917f86abfce99b7dd908bec0169288797f85049ec73cbe046ed9de818fab3a497ae09181900360200190a35092915050565b6000805487908110156100025750808052600e8702600080516020612a3683398151915201905090508484846040518084600160a060020a0316606060020a0281526014018381526020018280519060200190808383829060006004602084601f0104600f02600301f15090500193505050506040518091039020816005016000505414915050949350505050565b600014156110ce57610002565b82801561111857508660001415806110e857508451600014155b806111005750600354600160a060020a038981169116145b8061110b5750600034115b80611118575062093a8084105b1561112257610002565b8215801561114257506111348861115c565b158061114257506212750084105b156111fe57610002565b83546118e590600160a060020a03165b600160a060020a03811660009081526004602052604081205460ff16806111f15750601254600160a060020a039081169083161480156111f15750601260009054906101000a9004600160a060020a0316600160a060020a031663d2cc718f6040518160e060020a0281526004018090506020604051808303816000876161da5a03f115610002575050604051516006541190505b156129a157506001610606565b6249d40084111561120e57610002565b60115460ff1615806112215750600f5442105b806112365750600c5434108015611236575082155b1561124057610002565b42844201101561124f57610002565b30600160a060020a031633600160a060020a0316141561126e57610002565b60008054600181018083559091908280158290116112a557600e0281600e0283600052602060002091820191016112a5919061136a565b505060008054929450918491508110156100025750808052600e8302600080516020612a368339815191520190508054600160a060020a031916891781556001818101899055875160028084018054600082815260209081902096975091959481161561010002600019011691909104601f908101829004840193918b019083901061146257805160ff19168380011785555b5061149292915061144a565b5050600060098201819055600a820155600d81018054600160a060020a03191690556001015b8082111561145e578054600160a060020a03191681556000600182810182905560028084018054848255909281161561010002600019011604601f81901061143057505b506000600383018190556004808401805461ffff19169055600584018290556006840182905560078401805460ff191690556008840180548382559083526020909220611344929091028101905b8082111561145e57600080825560018201818155600283019190915560039091018054600160a060020a03191690556113fc565b601f0160209004906000526020600020908101906113ae91905b8082111561145e576000815560010161144a565b5090565b82800160010185558215611338579182015b82811115611338578251826000505591602001919060010190611474565b50508787866040518084600160a060020a0316606060020a0281526014018381526020018280519060200190808383829060006004602084601f0104600f02600301f150905001935050505060405180910390208160050160005081905550834201816003016000508190555060018160040160006101000a81548160ff02191690830217905550828160070160006101000a81548160ff02191690830217905550821561157857600881018054600181018083559091908280158290116115735760040281600402836000526020600020918201910161157391906113fc565b505050505b600d8082018054600160a060020a031916331790553460068301819055815401905560408051600160a060020a038a16815260208181018a9052918101859052608060608201818152895191830191909152885185937f5790de2c279e58269b93b12828f56fd5f2bc8ad15e61ce08572585c81a38756f938d938d938a938e93929160a084019185810191908190849082908590600090600490601f850104600f02600301f150905090810190601f1680156116485780820380516001836020036101000a031916815260200191505b509550505050505060405180910390a2509695505050505050565b6040805186815260208101839052815189927fdfc78bdca8e3e0b18c16c5c99323c6cb9eb5e00afde190b4e7273f5158702b07928290030190a25b5050505092915050565b6000805488908110156100025750808052600e8802600080516020612a36833981519152019050600781015490945060ff166116e757620d2f006116ec565b622398805b600485015490935060ff16801561170857506003840154830142115b15611716576117b887611890565b600384015442108061172d5750600484015460ff16155b806117ae57508360000160009054906101000a9004600160a060020a03168460010160005054876040518084600160a060020a0316606060020a0281526014018381526020018280519060200190808383829060006004602084601f0104600f02600301f15090500193505050506040518091039020846005016000505414155b1561114c57610002565b61169e565b60048401805461ff001916610100179055835460019550600160a060020a03908116309091161480159061180157508354600754600160a060020a03908116911614155b801561181d57506008548454600160a060020a03908116911614155b801561183957508354601254600160a060020a03908116911614155b801561185557506003548454600160a060020a03908116911614155b1561188b5760018401805430600160a060020a031660009081526005602052604090208054919091019055546006805490910190555b611663875b6000600060005082815481101561000257908052600e02600080516020612a36833981519152018150600481015490915060ff16156118d757600d80546006830154900390555b600401805460ff1916905550565b15156118f45761190087611890565b6001915061193161047f565b604051600d8501546006860154600160a060020a0391909116916000919082818181858883f193505050505061169e565b6001850154111561194157600091505b50600a8301546009840154865191019060049010801590611986575085600081518110156100025790602001015160f860020a900460f860020a02606860f860020a02145b80156119b6575085600181518110156100025790602001015160f860020a900460f860020a02603760f860020a02145b80156119e6575085600281518110156100025790602001015160f860020a900460f860020a0260ff60f860020a02145b8015611a16575085600381518110156100025790602001015160f860020a900460f860020a02601e60f860020a02145b8015611a45575030600160a060020a0316600090815260056020526040902054611a4290611a5d61047f565b81105b15611a4f57600091505b6001840154611a8090611a5f565b015b30600160a060020a03166000908152600560205260408120546129a961047f565b8110611ad457604051600d8501546006860154600160a060020a0391909116916000919082818181858883f193505050501515611abc57610002565b4260025560165460059004811115611ad45760056001555b6001840154611ae290611a5f565b8110158015611af85750600a8401546009850154115b8015611b015750815b1561188b578360000160009054906101000a9004600160a060020a0316600160a060020a0316846001016000505487604051808280519060200190808383829060006004602084601f0104600f02600301f150905090810190601f168015611b7d5780820380516001836020036101000a031916815260200191505b5091505060006040518083038185876185025a03f19250505015156117bd57610002565b611baa336105ec565b60001415611bb757610002565b60008054889081101561000257508052600e87027f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e566810154600080516020612a36833981519152919091019450421080611c1957506003840154622398800142115b80611c3257508354600160a060020a0390811690871614155b80611c425750600784015460ff16155b80611c68575033600160a060020a03166000908152600b8501602052604090205460ff16155b80611c9c575033600160a060020a03166000908152600b60205260409020548714801590611c9c5750604060009081205414155b15611ca657610002565b600884018054600090811015610002579081526020812060030154600160a060020a03161415611e1257611efc86604051600090600160a060020a038316907f9046fefd66f538ab35263248a44217dcb70e2eb2cd136629e141b8b8f9f03b60908390a260408051600e547fe2faf044000000000000000000000000000000000000000000000000000000008252600160a060020a03858116600484015260248301859052604483018590526223988042016064840152925192169163e2faf04491608480820192602092909190829003018187876161da5a03f1156100025750506040515191506106069050565b6008850180546000908110156100025781815260208082209390935530600160a060020a031681526005909252604082205481549092908110156100025790815260208120905060020155601654600885018054600090811015610002579081526020812090506001015560048401805461ff0019166101001790555b6008840180546000908110156100025781548282526020822060010154929190811015610002579081526020812090505433600160a060020a031660009081526014602052604081205460088801805493909102939093049550908110156100025790815260208120905060030154604080517fbaac530000000000000000000000000000000000000000000000000000000000815233600160a060020a0390811660048301529151929091169163baac53009186916024808301926020929190829003018185886185025a03f11561000257505060405151600014159150611f78905057610002565b60088501805460009081101561000257818152602081206003018054600160a060020a03191690931790925580549091908110156100025790815260208120905060030154600160a060020a031660001415611f5757610002565b600d5430600160a060020a0316311015611f7057610002565b611d9561047f565b6008840180546000908110156100025781548282526020822060010154929190811015610002579081526020812090506002015433600160a060020a0390811660009081526014602090815260408083205430909416835260058083528184205460099093529083205460088b018054969095029690960497509487020494508593929091908290811015610002575260208120815060030154600160a060020a0390811682526020828101939093526040918201600090812080549095019094553016835260059091529020548290101561205357610002565b30600160a060020a031660009081526005602052604081208054849003905560088501805483926009929091829081101561000257508152602080822060030154600160a060020a039081168352929052604080822080549094019093553090911681522054819010156120c657610002565b30600160a060020a0390811660009081526009602090815260408083208054869003905533909316808352601482528383205484519081529351929390927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef929181900390910190a36121383361086c565b5033600160a060020a03166000908152601460209081526040808320805460168054919091039055839055600a9091528120556001945061169e565b30600160a060020a0390811660008181526005602090815260408083208054958716808552828520805490970190965584845283905560099091528082208054948352908220805490940190935590815290555b50565b604051600160a060020a0382811691309091163190600081818185876185025a03f192505050151561217457610002565b33600160a060020a03818116600090815260096020908152604080832054815160065460085460e060020a63d2cc718f028352935197995091969195929092169363d2cc718f936004848101949193929183900301908290876161da5a03f11561000257505050604051805190602001506005600050600033600160a060020a03168152602001908152602001600020600050540204101561229d57610002565b600160a060020a03338116600090815260096020908152604080832054815160065460085460e060020a63d2cc718f02835293519296909593169363d2cc718f93600483810194929383900301908290876161da5a03f11561000257505050604051805190602001506005600050600033600160a060020a0316815260200190815260200160002060005054020403905083156123ec57600860009054906101000a9004600160a060020a0316600160a060020a0316630221038a83600160a060020a0316630e7082036040518160e060020a0281526004018090506020604051808303816000876161da5a03f11561000257505060408051805160e160020a63011081c5028252600160a060020a031660048201526024810186905290516044808301935060209282900301816000876161da5a03f115610002575050604051511515905061245457610002565b6040805160085460e160020a63011081c5028252600160a060020a038581166004840152602483018590529251921691630221038a9160448082019260209290919082900301816000876161da5a03f115610002575050604051511515905061245457610002565b600160a060020a03331660009081526009602052604090208054909101905550600192915050565b6109803361086c565b155b80156124a257506124a23384845b6000600061293a856105ec565b80156124be57506124be83836000600034111561261c57610002565b15610b9f5750600161033f565b15156124d657610002565b6124e08383610719565b905061033f565b155b80156124fb57506124fb848484612495565b80156125185750612518848484600060003411156126c157610002565b15610b9f57506001612528565b90505b9392505050565b151561253a57610002565b61252584848461041b565b30600160a060020a031633600160a060020a031614158061258a575030600160a060020a031660009081526005602052604090205460649061258561047f565b010481115b1561259457610002565b600c55565b600354600160a060020a0390811633909116146125b557610002565b600160a060020a038316600081815260046020908152604091829020805460ff191686179055815185815291517f73ad2a153c8b67991df9459024950b318a609782cee8c7eeda47b905f9baa91f9281900390910190a250600161033f565b506000610983565b33600160a060020a03166000908152601460205260409020548290108015906126455750600082115b156126b957600160a060020a03338116600081815260146020908152604080832080548890039055938716808352918490208054870190558351868152935191937fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef929081900390910190a350600161033f565b50600061033f565b600160a060020a03841660009081526014602052604090205482901080159061270a5750601560209081526040600081812033600160a060020a03168252909252902054829010155b80156127165750600082115b156127a457600160a060020a03838116600081815260146020908152604080832080548801905588851680845281842080548990039055601583528184203390961684529482529182902080548790039055815186815291519293927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a3506001612528565b506000612528565b600160a060020a038381166000908152600a6020908152604080832054601654600754835160e060020a63d2cc718f02815293519296919591169363d2cc718f9360048181019492939183900301908290876161da5a03f11561000257505060405151905061281a866105ec565b0204101561282757610002565b600160a060020a038381166000908152600a6020908152604080832054601654600754835160e060020a63d2cc718f02815293519296919591169363d2cc718f9360048181019492939183900301908290876161da5a03f115610002575050604051519050612895866105ec565b0204039050600760009054906101000a9004600160a060020a0316600160a060020a0316630221038a84836040518360e060020a0281526004018083600160a060020a03168152602001828152602001925050506020604051808303816000876161da5a03f115610002575050604051511515905061291357610002565b600160a060020a0383166000908152600a6020526040902080548201905560019150610b99565b600160a060020a0386166000908152600a602052604090205480850291909104915081111561296857610002565b600160a060020a038581166000908152600a60205260408082208054859003905591861681522080548201905560019150509392505050565b506000610606565b0160030260166000505483020460016000505460166000505404019050610606565b600160a060020a0383166000908152600b6020526040812054815481101561000257818052600e02600080516020612a368339815191520190506003810154909150421115610b9457600160a060020a0383166000908152600b602052604081208190559150610b9956290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563",
                 "nonce" : "0",
                 "storage" : {
@@ -50,7 +50,7 @@
             },
 	    "1000000000000000000000000000000000000002" : {
                 "balance" : "0",
-		"comment" : "A legit solidity contract",
+                "//comment" : "A legit solidity contract",
                 "code" : "0x6060604052361561020e5760e060020a6000350463013cf08b8114610247578063095ea7b3146102d05780630c3b7b96146103455780630e7082031461034e578063149acf9a1461036057806318160ddd146103725780631f2dc5ef1461037b57806321b5b8dd1461039b578063237e9492146103ad57806323b872dd1461040e5780632632bf2014610441578063341458081461047257806339d1f9081461047b5780634b6753bc146104935780634df6d6cc1461049c5780634e10c3ee146104b7578063590e1ae3146104ca578063612e45a3146104db578063643f7cdd1461057a578063674ed066146105925780636837ff1e1461059b57806370a08231146105e5578063749f98891461060b57806378524b2e1461062457806381f03fcb1461067e57806382661dc41461069657806382bf6464146106b75780638b15a605146106c95780638d7af473146106d257806396d7f3f5146106e1578063a1da2fb9146106ea578063a3912ec814610704578063a9059cbb1461070f578063b7bc2c841461073f578063baac53001461074b578063be7c29c1146107b1578063c9d27afe14610817578063cc9ae3f61461082d578063cdef91d014610841578063dbde198814610859578063dd62ed3e1461087e578063e33734fd146108b2578063e5962195146108c6578063e66f53b7146108de578063eceb2945146108f0578063f8c80d261461094f575b610966600f546000906234bc000142108015610239575060125433600160a060020a03908116911614155b156109785761098033610752565b6109866004356000805482908110156100025750808052600e8202600080516020612a3683398151915201905060038101546004820154600683015460018401548454600786015460058701546009880154600a890154600d8a0154600160a060020a039586169b509599600201989760ff81811698610100909204811697949691951693168c565b61096660043560243533600160a060020a03908116600081815260156020908152604080832094871680845294825280832086905580518681529051929493927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a35060015b92915050565b61096660105481565b610a7d600754600160a060020a031681565b610a7d600e54600160a060020a031681565b61096660165481565b6109665b60004262127500600f60005054031115610de557506014610983565b610a7d601254600160a060020a031681565b60408051602060248035600481810135601f810185900485028601850190965285855261096695813595919460449492939092019181908401838280828437509496505050505050506000600060006000600060003411156116a857610002565b6109666004356024356044355b60115460009060ff1680156104315750600f5442115b80156124e957506124e78461044b565b6109666000610980335b600160a060020a0381166000908152600b602052604081205481908114156129cb57610b99565b61096660065481565b6109665b600d5430600160a060020a03163103610983565b610966600f5481565b61096660043560046020526000908152604090205460ff1681565b61096660043560243560006124cb610831565b610a9a6000341115610ba457610002565b604080516020604435600481810135601f8101849004840285018401909552848452610966948135946024803595939460649492939101918190840183828082843750506040805160209735808a0135601f81018a90048a0283018a01909352828252969897608497919650602491909101945090925082915084018382808284375094965050933593505060a435915050600060006110c1336105ec565b61096660043560096020526000908152604090205481565b61096660015481565b610a9a60043530600160a060020a031633600160a060020a03161415806105db5750600160a060020a03811660009081526004602052604090205460ff16155b156121cb576121c8565b6109666004355b600160a060020a0381166000908152601460205260409020545b919050565b6109666004356024356000600034111561259957610002565b610966600062e6b680420360026000505410806106505750600354600160a060020a0390811633909116145b80156106645750600254621274ff19420190105b156126145750426002908155600180549091028155610983565b610966600435600a6020526000908152604090205481565b610966600435602435600060006000600060006000341115611ba157610002565b610a7d600854600160a060020a031681565b610966600c5481565b61096660005460001901610983565b61096660025481565b61096660043560006000600060003411156121fc57610002565b6109665b6001610983565b6109666004356024355b60115460009060ff16801561072f5750600f5442115b801561248757506124853361044b565b61096660115460ff1681565b6109666004355b60006000600f600050544210801561076a5750600034115b80156107a457506011546101009004600160a060020a0316600014806107a457506011546101009004600160a060020a0390811633909116145b15610b9f57610a9c61037f565b610a7d600435600060006000508281548110156100025750508080527f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e56b600e83020180548290811015610002575081526020902060030154600160a060020a0316610606565b61096660043560243560006000610e1b336105ec565b6109665b6000600034111561247c57610002565b61096660043560056020526000908152604090205481565b610966600435602435604435600061252f845b6000600060003411156127ac57610002565b610966600435602435600160a060020a0382811660009081526015602090815260408083209385168352929052205461033f565b610a9a600435600034111561254557610002565b610966600435600b6020526000908152604090205481565b610a7d600354600160a060020a031681565b604080516020606435600481810135601f81018490048402850184019095528484526109669481359460248035956044359560849492019190819084018382808284375094965050505050505060006000600034111561103257610002565b610a7d6011546101009004600160a060020a031681565b60408051918252519081900360200190f35b610980610708565b90505b90565b604051808d600160a060020a031681526020018c8152602001806020018b81526020018a815260200189815260200188815260200187815260200186815260200185815260200184815260200183600160a060020a0316815260200182810382528c818154600181600116156101000203166002900481526020019150805460018160011615610100020316600290048015610a635780601f10610a3857610100808354040283529160200191610a63565b820191906000526020600020905b815481529060010190602001808311610a4657829003601f168201915b50509d505050505050505050505050505060405180910390f35b60408051600160a060020a03929092168252519081900360200190f35b005b604051601254601434908102939093049350600160a060020a03169183900390600081818185876185025a03f150505050600160a060020a038316600081815260146020908152604080832080548601905560168054860190556013825291829020805434019055815184815291517fdbccb92686efceafb9bb7e0394df7f58f71b954061b81afb57109bf247d3d75a9281900390910190a260105460165410801590610b4c575060115460ff16155b15610b94576011805460ff1916600117905560165460408051918252517ff381a3e2428fdda36615919e8d9c35878d9eb0cf85ac6edf575088e80e4c147e9181900360200190a15b600191505b50919050565b610002565b600f5442118015610bb8575060115460ff16155b15610de357601260009054906101000a9004600160a060020a0316600160a060020a031663d2cc718f6040518160e060020a0281526004018090506020604051808303816000876161da5a03f1156100025750506040516012549051600160a060020a039190911631109050610cc9576040805160125460e060020a63d2cc718f0282529151600160a060020a039290921691630221038a913091849163d2cc718f91600482810192602092919082900301816000876161da5a03f11561000257505060408051805160e160020a63011081c5028252600160a060020a039490941660048201526024810193909352516044838101936020935082900301816000876161da5a03f115610002575050505b33600160a060020a0316600081815260136020526040808220549051909181818185876185025a03f19250505015610de35733600160a060020a03167fbb28353e4598c3b9199101a66e0989549b659a59a54d2c27fbb183f1932c8e6d6013600050600033600160a060020a03168152602001908152602001600020600050546040518082815260200191505060405180910390a26014600050600033600160a060020a0316815260200190815260200160002060005054601660008282825054039250508190555060006014600050600033600160a060020a031681526020019081526020016000206000508190555060006013600050600033600160a060020a03168152602001908152602001600020600050819055505b565b4262054600600f60005054031115610e13576201518062127500600f60005054034203046014019050610983565b50601e610983565b60001415610e2857610002565b6000341115610e3657610002565b6000805485908110156100025750600160a060020a03331681527f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e56e600e8602908101602052604090912054600080516020612a3683398151915291909101915060ff1680610eb05750600c810160205260406000205460ff165b80610ebf575060038101544210155b15610ec957610002565b8215610f0f5733600160a060020a03166000908152601460209081526040808320546009850180549091019055600b84019091529020805460ff19166001179055610f4b565b33600160a060020a0316600090815260146020908152604080832054600a850180549091019055600c84019091529020805460ff191660011790555b33600160a060020a03166000908152600b60205260408120541415610f77576040600020849055610feb565b33600160a060020a03166000908152600b60205260408120548154811015610002579080527f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e566600e909102015460038201541115610feb5733600160a060020a03166000908152600b602052604090208490555b60408051848152905133600160a060020a03169186917f86abfce99b7dd908bec0169288797f85049ec73cbe046ed9de818fab3a497ae09181900360200190a35092915050565b6000805487908110156100025750808052600e8702600080516020612a3683398151915201905090508484846040518084600160a060020a0316606060020a0281526014018381526020018280519060200190808383829060006004602084601f0104600f02600301f15090500193505050506040518091039020816005016000505414915050949350505050565b600014156110ce57610002565b82801561111857508660001415806110e857508451600014155b806111005750600354600160a060020a038981169116145b8061110b5750600034115b80611118575062093a8084105b1561112257610002565b8215801561114257506111348861115c565b158061114257506212750084105b156111fe57610002565b83546118e590600160a060020a03165b600160a060020a03811660009081526004602052604081205460ff16806111f15750601254600160a060020a039081169083161480156111f15750601260009054906101000a9004600160a060020a0316600160a060020a031663d2cc718f6040518160e060020a0281526004018090506020604051808303816000876161da5a03f115610002575050604051516006541190505b156129a157506001610606565b6249d40084111561120e57610002565b60115460ff1615806112215750600f5442105b806112365750600c5434108015611236575082155b1561124057610002565b42844201101561124f57610002565b30600160a060020a031633600160a060020a0316141561126e57610002565b60008054600181018083559091908280158290116112a557600e0281600e0283600052602060002091820191016112a5919061136a565b505060008054929450918491508110156100025750808052600e8302600080516020612a368339815191520190508054600160a060020a031916891781556001818101899055875160028084018054600082815260209081902096975091959481161561010002600019011691909104601f908101829004840193918b019083901061146257805160ff19168380011785555b5061149292915061144a565b5050600060098201819055600a820155600d81018054600160a060020a03191690556001015b8082111561145e578054600160a060020a03191681556000600182810182905560028084018054848255909281161561010002600019011604601f81901061143057505b506000600383018190556004808401805461ffff19169055600584018290556006840182905560078401805460ff191690556008840180548382559083526020909220611344929091028101905b8082111561145e57600080825560018201818155600283019190915560039091018054600160a060020a03191690556113fc565b601f0160209004906000526020600020908101906113ae91905b8082111561145e576000815560010161144a565b5090565b82800160010185558215611338579182015b82811115611338578251826000505591602001919060010190611474565b50508787866040518084600160a060020a0316606060020a0281526014018381526020018280519060200190808383829060006004602084601f0104600f02600301f150905001935050505060405180910390208160050160005081905550834201816003016000508190555060018160040160006101000a81548160ff02191690830217905550828160070160006101000a81548160ff02191690830217905550821561157857600881018054600181018083559091908280158290116115735760040281600402836000526020600020918201910161157391906113fc565b505050505b600d8082018054600160a060020a031916331790553460068301819055815401905560408051600160a060020a038a16815260208181018a9052918101859052608060608201818152895191830191909152885185937f5790de2c279e58269b93b12828f56fd5f2bc8ad15e61ce08572585c81a38756f938d938d938a938e93929160a084019185810191908190849082908590600090600490601f850104600f02600301f150905090810190601f1680156116485780820380516001836020036101000a031916815260200191505b509550505050505060405180910390a2509695505050505050565b6040805186815260208101839052815189927fdfc78bdca8e3e0b18c16c5c99323c6cb9eb5e00afde190b4e7273f5158702b07928290030190a25b5050505092915050565b6000805488908110156100025750808052600e8802600080516020612a36833981519152019050600781015490945060ff166116e757620d2f006116ec565b622398805b600485015490935060ff16801561170857506003840154830142115b15611716576117b887611890565b600384015442108061172d5750600484015460ff16155b806117ae57508360000160009054906101000a9004600160a060020a03168460010160005054876040518084600160a060020a0316606060020a0281526014018381526020018280519060200190808383829060006004602084601f0104600f02600301f15090500193505050506040518091039020846005016000505414155b1561114c57610002565b61169e565b60048401805461ff001916610100179055835460019550600160a060020a03908116309091161480159061180157508354600754600160a060020a03908116911614155b801561181d57506008548454600160a060020a03908116911614155b801561183957508354601254600160a060020a03908116911614155b801561185557506003548454600160a060020a03908116911614155b1561188b5760018401805430600160a060020a031660009081526005602052604090208054919091019055546006805490910190555b611663875b6000600060005082815481101561000257908052600e02600080516020612a36833981519152018150600481015490915060ff16156118d757600d80546006830154900390555b600401805460ff1916905550565b15156118f45761190087611890565b6001915061193161047f565b604051600d8501546006860154600160a060020a0391909116916000919082818181858883f193505050505061169e565b6001850154111561194157600091505b50600a8301546009840154865191019060049010801590611986575085600081518110156100025790602001015160f860020a900460f860020a02606860f860020a02145b80156119b6575085600181518110156100025790602001015160f860020a900460f860020a02603760f860020a02145b80156119e6575085600281518110156100025790602001015160f860020a900460f860020a0260ff60f860020a02145b8015611a16575085600381518110156100025790602001015160f860020a900460f860020a02601e60f860020a02145b8015611a45575030600160a060020a0316600090815260056020526040902054611a4290611a5d61047f565b81105b15611a4f57600091505b6001840154611a8090611a5f565b015b30600160a060020a03166000908152600560205260408120546129a961047f565b8110611ad457604051600d8501546006860154600160a060020a0391909116916000919082818181858883f193505050501515611abc57610002565b4260025560165460059004811115611ad45760056001555b6001840154611ae290611a5f565b8110158015611af85750600a8401546009850154115b8015611b015750815b1561188b578360000160009054906101000a9004600160a060020a0316600160a060020a0316846001016000505487604051808280519060200190808383829060006004602084601f0104600f02600301f150905090810190601f168015611b7d5780820380516001836020036101000a031916815260200191505b5091505060006040518083038185876185025a03f19250505015156117bd57610002565b611baa336105ec565b60001415611bb757610002565b60008054889081101561000257508052600e87027f290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e566810154600080516020612a36833981519152919091019450421080611c1957506003840154622398800142115b80611c3257508354600160a060020a0390811690871614155b80611c425750600784015460ff16155b80611c68575033600160a060020a03166000908152600b8501602052604090205460ff16155b80611c9c575033600160a060020a03166000908152600b60205260409020548714801590611c9c5750604060009081205414155b15611ca657610002565b600884018054600090811015610002579081526020812060030154600160a060020a03161415611e1257611efc86604051600090600160a060020a038316907f9046fefd66f538ab35263248a44217dcb70e2eb2cd136629e141b8b8f9f03b60908390a260408051600e547fe2faf044000000000000000000000000000000000000000000000000000000008252600160a060020a03858116600484015260248301859052604483018590526223988042016064840152925192169163e2faf04491608480820192602092909190829003018187876161da5a03f1156100025750506040515191506106069050565b6008850180546000908110156100025781815260208082209390935530600160a060020a031681526005909252604082205481549092908110156100025790815260208120905060020155601654600885018054600090811015610002579081526020812090506001015560048401805461ff0019166101001790555b6008840180546000908110156100025781548282526020822060010154929190811015610002579081526020812090505433600160a060020a031660009081526014602052604081205460088801805493909102939093049550908110156100025790815260208120905060030154604080517fbaac530000000000000000000000000000000000000000000000000000000000815233600160a060020a0390811660048301529151929091169163baac53009186916024808301926020929190829003018185886185025a03f11561000257505060405151600014159150611f78905057610002565b60088501805460009081101561000257818152602081206003018054600160a060020a03191690931790925580549091908110156100025790815260208120905060030154600160a060020a031660001415611f5757610002565b600d5430600160a060020a0316311015611f7057610002565b611d9561047f565b6008840180546000908110156100025781548282526020822060010154929190811015610002579081526020812090506002015433600160a060020a0390811660009081526014602090815260408083205430909416835260058083528184205460099093529083205460088b018054969095029690960497509487020494508593929091908290811015610002575260208120815060030154600160a060020a0390811682526020828101939093526040918201600090812080549095019094553016835260059091529020548290101561205357610002565b30600160a060020a031660009081526005602052604081208054849003905560088501805483926009929091829081101561000257508152602080822060030154600160a060020a039081168352929052604080822080549094019093553090911681522054819010156120c657610002565b30600160a060020a0390811660009081526009602090815260408083208054869003905533909316808352601482528383205484519081529351929390927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef929181900390910190a36121383361086c565b5033600160a060020a03166000908152601460209081526040808320805460168054919091039055839055600a9091528120556001945061169e565b30600160a060020a0390811660008181526005602090815260408083208054958716808552828520805490970190965584845283905560099091528082208054948352908220805490940190935590815290555b50565b604051600160a060020a0382811691309091163190600081818185876185025a03f192505050151561217457610002565b33600160a060020a03818116600090815260096020908152604080832054815160065460085460e060020a63d2cc718f028352935197995091969195929092169363d2cc718f936004848101949193929183900301908290876161da5a03f11561000257505050604051805190602001506005600050600033600160a060020a03168152602001908152602001600020600050540204101561229d57610002565b600160a060020a03338116600090815260096020908152604080832054815160065460085460e060020a63d2cc718f02835293519296909593169363d2cc718f93600483810194929383900301908290876161da5a03f11561000257505050604051805190602001506005600050600033600160a060020a0316815260200190815260200160002060005054020403905083156123ec57600860009054906101000a9004600160a060020a0316600160a060020a0316630221038a83600160a060020a0316630e7082036040518160e060020a0281526004018090506020604051808303816000876161da5a03f11561000257505060408051805160e160020a63011081c5028252600160a060020a031660048201526024810186905290516044808301935060209282900301816000876161da5a03f115610002575050604051511515905061245457610002565b6040805160085460e160020a63011081c5028252600160a060020a038581166004840152602483018590529251921691630221038a9160448082019260209290919082900301816000876161da5a03f115610002575050604051511515905061245457610002565b600160a060020a03331660009081526009602052604090208054909101905550600192915050565b6109803361086c565b155b80156124a257506124a23384845b6000600061293a856105ec565b80156124be57506124be83836000600034111561261c57610002565b15610b9f5750600161033f565b15156124d657610002565b6124e08383610719565b905061033f565b155b80156124fb57506124fb848484612495565b80156125185750612518848484600060003411156126c157610002565b15610b9f57506001612528565b90505b9392505050565b151561253a57610002565b61252584848461041b565b30600160a060020a031633600160a060020a031614158061258a575030600160a060020a031660009081526005602052604090205460649061258561047f565b010481115b1561259457610002565b600c55565b600354600160a060020a0390811633909116146125b557610002565b600160a060020a038316600081815260046020908152604091829020805460ff191686179055815185815291517f73ad2a153c8b67991df9459024950b318a609782cee8c7eeda47b905f9baa91f9281900390910190a250600161033f565b506000610983565b33600160a060020a03166000908152601460205260409020548290108015906126455750600082115b156126b957600160a060020a03338116600081815260146020908152604080832080548890039055938716808352918490208054870190558351868152935191937fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef929081900390910190a350600161033f565b50600061033f565b600160a060020a03841660009081526014602052604090205482901080159061270a5750601560209081526040600081812033600160a060020a03168252909252902054829010155b80156127165750600082115b156127a457600160a060020a03838116600081815260146020908152604080832080548801905588851680845281842080548990039055601583528184203390961684529482529182902080548790039055815186815291519293927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a3506001612528565b506000612528565b600160a060020a038381166000908152600a6020908152604080832054601654600754835160e060020a63d2cc718f02815293519296919591169363d2cc718f9360048181019492939183900301908290876161da5a03f11561000257505060405151905061281a866105ec565b0204101561282757610002565b600160a060020a038381166000908152600a6020908152604080832054601654600754835160e060020a63d2cc718f02815293519296919591169363d2cc718f9360048181019492939183900301908290876161da5a03f115610002575050604051519050612895866105ec565b0204039050600760009054906101000a9004600160a060020a0316600160a060020a0316630221038a84836040518360e060020a0281526004018083600160a060020a03168152602001828152602001925050506020604051808303816000876161da5a03f115610002575050604051511515905061291357610002565b600160a060020a0383166000908152600a6020526040902080548201905560019150610b99565b600160a060020a0386166000908152600a602052604090205480850291909104915081111561296857610002565b600160a060020a038581166000908152600a60205260408082208054859003905591861681522080548201905560019150509392505050565b506000610606565b0160030260166000505483020460016000505460166000505404019050610606565b600160a060020a0383166000908152600b6020526040812054815481101561000257818052600e02600080516020612a368339815191520190506003810154909150421115610b9457600160a060020a0383166000908152600b602052604081208190559150610b9956290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e563",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/BlockchainTestsFiller/bcExploitTest/ShanghaiLoveFiller.json b/src/BlockchainTestsFiller/bcExploitTest/ShanghaiLoveFiller.json
index 1d885804a..30c95380e 100644
--- a/src/BlockchainTestsFiller/bcExploitTest/ShanghaiLoveFiller.json
+++ b/src/BlockchainTestsFiller/bcExploitTest/ShanghaiLoveFiller.json
@@ -47,7 +47,7 @@
             },
             "d6a64d7e8c8a94fa5068ca33229d88436a743b14" : {
                 "balance" : "0",
-		"comment" : "shanghailove",
+                "//comment" : "shanghailove",
                 "code" : "0x612800600080734ce312538aa0b69740cbabfbfd8a2a8e628f660d3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561001e57506128006000807389ad4426e629368ecb9d63ab01e5ca538fbdc1a43c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610076575061280060008073d38af0f92dde2bc5c6c94c6083a9167507aec37b3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156100ce575061280060008073679d434b06dee1686eb044cc721d41e20e298abc3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610126575061280060008073ace25ff1eeca76317d3baf12d426624b5298c4e53c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561017e575061280060008073fbd5df4ff4790f881b3ad7f64edba082d75a449b3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156101d6575061280060008073629fb9aa6daef7e0caf641a6a9e9df796ed83ce73c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561022e57506128006000807378cc9e707d760b6693bb114a2259d435fe19b9373c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610286575061280060008073be90f452775a16749c225542501a67065dcb6db73c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156102de57506128006000807396ab58c915ee9264c4da5d2f0c92972bb5e1a23a3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610336575061280060008073c1371fb167dca98266cc357952f0f9ad2ff723033c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561038e575061280060008073dc0426d50398fd4847ae886def8db0c7f32fc1653c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156103e6575061280060008073ee92e5c794c08581aa92b4a7e78dff62d343afb73c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561043e575061280060008073c72c3ebd888ac1970a8712fef74a1f9b9beecad33c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561049657506128006000807313bc06227d1bcff708065491b8e0d7794e0e7de53c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156104ee575061280060008073d90b72526e124075805bbb472b70d96da5e4d7473c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610546575061280060008073a9ac072b051c00fa940164949cf6106076d267583c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561059e575061280060008073fbeaafd60c6102583af45fbae9e5c423efa661ab3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156105f6575061280060008073296516205b5fcdeab789d90f307ffad120f2d4573c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561064e57506128006000807304e11d27de725f7e9601167b5e3696da9ce40d7a3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156106a6575061280060008073eda6f8f6d6b2e7daf7a11f62e51a72449bd2daf13c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156106fe575061280060008073fabcdaeedc07d8013f006e6280e72d1f51dcdd263c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156107565750612800600080731dbc58db158a3a027df480faffdc65a6bfedbbec3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156107ae5750612800600080733f456e749863e7bf1a00e11a7de3f6b47ce999323c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610806575061280060008073ad523418157de7bb715ac689ef099dfced7ab1e63c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561085e57506128006000807343ebdeafe1f5f30ed91f26dfc88af7acc113f0123c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156108b65750612800600080737e022766caa162007aea9fc3b429e3d9e49314b43c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561090e575061280060008073888bee4c8478e74bf6e066e73ba14179ac7414273c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156109665750612800600080739bf986bf345894f30ff0d22b11bc28bb1fe098c13c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156109be575061280060008073123bc327b0a97cfc77074100933aad0ec642beb43c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610a16575061280060008073bd674fc9b32eb1099b1affccfc624cb8afcf1c023c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610a6e575061280060008073389f0c87f72d7eed2edcf8893cd0abd3b669f8dd3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610ac65750612800600080738ba43f7e6cc99f15c51b724d774a4e908768caef3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610b1e5750612800600080739b9b19947abdd56b902672c50121d793d9fceea93c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610b7657506128006000807396ce5896b217a5d43efe133de63b03b105b66ef63c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610bce5750612800600080735c0eb5d9ab93e3a8978e19308e52c140887b7b183c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610c265750612800600080731b4f6b2a9bdab71bfdf24aa87272841bde969ee03c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610c7e575061280060008073e6a2b33e1f00d73609c3e998f5983b558e76541f3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610cd6575061280060008073d5f8364f460cd1e7143b06e02f23512244b135b73c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610d2e575061280060008073d2fcd0803d95bd5974109a9b6a37028cbf180b6e3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610d865750612800600080733e3bbda21848fa0e6778e36b2fbf1533b80502f83c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610dde575061280060008073af8fc22c1c1dc40e35dbf8b9a320a40bf53ab0af3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610e365750612800600080736f7c51628c3690d59bc2e179c3137735cadab1983c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610e8e57506128006000807347f0d4362a266fcf985b8ea0e282c754ffc0d7bf3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610ee6575061280060008073ad45b966235cede0a2684e93c05201b383d764843c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610f3e575061280060008073fa4abfd676caebe39f1fb8804f33bf2bb405069b3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610f96575061280060008073c18564061499477df278327ed1c7d31a46ce75193c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415610fee5750612800600080734ca8641e969d6892767640b9ac4beadca2736f803c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611046575061280060008073de07b141354cb7dc5ce3a0b65557484c34d720183c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561109e57506128006000807341a7fb9c3fb74001b43816a8d70107ae2844a09f3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156110f6575061280060008073ac0fa2de9320e0a850ba888fa05cd86367f63b933c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561114e575061280060008073f163279adf52338218067b59900e752f08617c403c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156111a6575061280060008073f9697f38b6a7c311d8a358a4df493123babbd5843c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156111fe575061280060008073647ec6495f4d958b80a8c7584910b586543fbdac3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156112565750612800600080733317203629861da4f62a04ea70221bdcdf7074cd3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156112ae57506128006000807345c2a5216e5b4f132096f64b50ac05f201925e613c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611306575061280060008073d1c8b08b0e13504976ecfdcc407661556bde6ec63c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561135e575061280060008073f4e06d554038fedb3a6c6e04278e5129c4e5959b3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156113b657506128006000807385068541d456d2af6683474cb7323beef24c4aac3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561140e57506128006000807381c2680b6be2988875b120630fac20c398e1d9de3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561146657506128006000807340c680b29b369af25e247276538241098b5b1f303c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156114be5750612800600080737b9fd32a0a809dee2d8a819d40002fe33aeda21e3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611516575061280060008073ef279fb1b4e402320e70967a4f93fd81c9f691333c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561156e5750612800600080739f90e33211226686ce5d0e8065ec046637eec92e3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156115c657506128006000807369b636398ce39425fcc43fc10cd0cc4b4e06323e3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561161e575061280060008073ab97422e6352b453eee862626451f8138339943e3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561167657506128006000807351161dae22a7012751ff4a4d38ef4b6455a3fdd33c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156116ce57506128006000807331ee3ce13a0f1f9231e2d213864b336fd406bd203c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156117265750612800600080733fd26bcef008744941d9ea6d11b233138813695a3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561177e57506128006000807363bf6fbd344045f3e1b18bf676d824b8d52218c23c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156117d6575061280060008073c66313b9ef38cafe541fa7ec3d4d700a1c8c5cfe3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561182e57506128006000807347a37c10a74ecdfef7f359fba5991d9ef279a15b3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611886575061280060008073044d77fc514c7f566051cafb248ac3f8dc8b36fe3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156118de5750612800600080730428cea98d32c6620f4c84206b84b895b20095f53c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156119365750612800600080734bab60362fdc1c064d69628391f87495ecf9ca733c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561198e575061280060008073731aeed483e75d644a975fd3257fc07c7118cc883c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156119e657506128006000807332fe59a975a091540bfbf327f0edf1ced997627b3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611a3e575061280060008073ed0c2024896a2564ae69aa3e9f107e4e8be2944a3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611a96575061280060008073f604f282a9bf0772a294be1a481ff2c0e437245d3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611aee575061280060008073f70cf9be2ccf10b39b93c95fdc16f4b9972f1b643c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611b465750612800600080731a9559716cafded0b9573768ea52ee29e922b6873c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611b9e575061280060008073526634cde83e541ba851a402e5c85bd0838505eb3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611bf657506128006000807315b593e70e0172a3faa046eec8aec3e629610b1c3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611c4e5750612800600080733d408586c7b4dd5d79459d857ff5995c2515fb4d3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611ca6575061280060008073f99b0919121a7b8ec0716996030bfe3e0b805e2d3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611cfe575061280060008073f440008157ca3744f4e65e42fa31151617e7e02e3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611d5657506128006000807307f3738bc35a76e3eafaf2a261e2db81263481fd3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611dae575061280060008073cd2895627a599b27b50dfe6775cb25678861fa4d3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611e065750612800600080736203146b89af87443c864b39fc679b4ea13dbbca3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611e5e57506128006000807302ec139ed20216bac58e1efa8189839522564fed3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611eb6575061280060008073f10baa92c88b2f03181cff070b95e62c8ab52dcb3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611f0e57506128006000807386d79ba60e0df4ab15aada5615b6764f231a68d13c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611f66575061280060008073532f2f3fded63798246f6c512e18a5e33468b2cf3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415611fbe5750612800600080734b2cd9baa98e977304b1bb96640c257aa38a9af13c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415612016575061280060008073150295d2d7717cd6328214309bcb09474080273f3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561206e57506128006000807361efba685735f700d077ce1a82dda58758549ad73c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156120c6575061280060008073750e9763d585fd5278c4a2f17653e324c37195223c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561211e57506128006000807325f9f251af7a1eb271925f4318f418830dd6be5e3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b50601401806128001415612176575061280060008073bfc526d0197abc3be3bc719367ec2333bc235d223c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b506014018061280014156121ce575061280060008073b171781675d320498b1cddc0fb938b5fb8cfd62b3c60005b80516c0100000000000000000000000090047366726f6d7368616e67686169776974686c6f766590183b5060140180612800141561222657506000808080807347b39d9ab2b170fef87705b92988f919503c28b0602b5a03f1",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/BlockchainTestsFiller/bcExploitTest/SuicideIssueFiller.json b/src/BlockchainTestsFiller/bcExploitTest/SuicideIssueFiller.json
index 2c0b62633..8c26c0ccf 100644
--- a/src/BlockchainTestsFiller/bcExploitTest/SuicideIssueFiller.json
+++ b/src/BlockchainTestsFiller/bcExploitTest/SuicideIssueFiller.json
@@ -94084,7 +94084,6 @@
                 }
             },
             "8888f1f195afa192cfee860698584c030f4c9db1" : {
-                "balance" : "15000000000582749575",
                 "code" : "0x",
                 "nonce" : "0x00",
                 "storage" : {
diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest109BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest109BCFiller.json
index 4652d2764..75aa0d0c0 100644
--- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest109BCFiller.json
+++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest109BCFiller.json
@@ -92,14 +92,14 @@
 				}
 			    },
 			    "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-				"balance" : "5000000000000042322",
+				"balance" : "3000000000000041542",
 				"code" : "0x6000355415600957005b60203560003555",
 				"nonce" : "0x00",
 				"storage" : {
 				}
 			    },
 			    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-				"balance" : "999999999999857724",
+				"balance" : "999999999999858504",
 				"code" : "",
 				"nonce" : "0x01",
 				"storage" : {
diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest113BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest113BCFiller.json
index 363355c29..d787c3ef0 100644
--- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest113BCFiller.json
+++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest113BCFiller.json
@@ -65,14 +65,14 @@
 				}
 			    },
 			    "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-				"balance" : "5000000000000052023",
+				"balance" : "3000000000000051243",
 				"code" : "0x6000355415600957005b60203560003555",
 				"nonce" : "0x00",
 				"storage" : {
 				}
 			    },
 			    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-				"balance" : "999999999144729474",
+				"balance" : "999999999144730254",
 				"code" : "",
 				"nonce" : "0x01",
 				"storage" : {
diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest127BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest127BCFiller.json
index 99a746c91..2509ab557 100644
--- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest127BCFiller.json
+++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest127BCFiller.json
@@ -65,14 +65,14 @@
 				}
 			    },
 			    "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-				"balance" : "5000000000000041938",
+				"balance" : "3000000000000041158",
 				"code" : "0x6000355415600957005b60203560003555",
 				"nonce" : "0x00",
 				"storage" : {
 				}
 			    },
 			    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-				"balance" : "999999999999858108",
+				"balance" : "999999999999858888",
 				"code" : "",
 				"nonce" : "0x01",
 				"storage" : {
diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest128BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest128BCFiller.json
index 9cb38310c..beca781b3 100644
--- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest128BCFiller.json
+++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest128BCFiller.json
@@ -65,14 +65,14 @@
 				}
 			    },
 			    "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-				"balance" : "5000000000000045684",
+				"balance" : "3000000000000044904",
 				"code" : "0x6000355415600957005b60203560003555",
 				"nonce" : "0x00",
 				"storage" : {
 				}
 			    },
 			    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-				"balance" : "999999999122036488",
+				"balance" : "999999999122037268",
 				"code" : "",
 				"nonce" : "0x01",
 				"storage" : {
diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest132BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest132BCFiller.json
index 2314d44f6..03a9278e2 100644
--- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest132BCFiller.json
+++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest132BCFiller.json
@@ -63,14 +63,14 @@
 				}
 			    },
 			    "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-				"balance" : "5000000000000032560",
+				"balance" : "3000000000000031780",
 				"code" : "0x6000355415600957005b60203560003555",
 				"nonce" : "0x00",
 				"storage" : {
 				}
 			    },
 			    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-				"balance" : "999999998765348658",
+				"balance" : "999999998765349438",
 				"code" : "",
 				"nonce" : "0x01",
 				"storage" : {
diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest21BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest21BCFiller.json
index 71394bc95..be1a9227c 100644
--- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest21BCFiller.json
+++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest21BCFiller.json
@@ -89,14 +89,14 @@
 				}
 			    },
 			    "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-				"balance" : "5000000000000023626",
+				"balance" : "3000000000000022066",
 				"code" : "0x6000355415600957005b60203560003555",
 				"nonce" : "0x00",
 				"storage" : {
 				}
 			    },
 			    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-				"balance" : "999999999999876420",
+				"balance" : "999999999999877980",
 				"code" : "",
 				"nonce" : "0x01",
 				"storage" : {
diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest344BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest344BCFiller.json
index 5ef961d3a..bfe7ea815 100644
--- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest344BCFiller.json
+++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest344BCFiller.json
@@ -89,14 +89,14 @@
 				}
 			    },
 			    "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-				"balance" : "5000000000000036899",
+				"balance" : "3000000000000036119",
 				"code" : "0x6000355415600957005b60203560003555",
 				"nonce" : "0x00",
 				"storage" : {
 				}
 			    },
 			    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-				"balance" : "999999999188904616",
+				"balance" : "999999999188905396",
 				"code" : "",
 				"nonce" : "0x01",
 				"storage" : {
diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest34BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest34BCFiller.json
index ebd34d41a..7323ea73f 100644
--- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest34BCFiller.json
+++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest34BCFiller.json
@@ -65,14 +65,14 @@
 				}
 			    },
 			    "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-				"balance" : "5000000000000042729",
+				"balance" : "3000000000000041169",
 				"code" : "0x6000355415600957005b60203560003555",
 				"nonce" : "0x00",
 				"storage" : {
 				}
 			    },
 			    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-				"balance" : "999999999999857317",
+				"balance" : "999999999999858877",
 				"code" : "",
 				"nonce" : "0x01",
 				"storage" : {
diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest35BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest35BCFiller.json
index d545d3f1d..e9ebe6005 100644
--- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest35BCFiller.json
+++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest35BCFiller.json
@@ -92,14 +92,14 @@
 				}
 			    },
 			    "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-				"balance" : "5000000000000043126",
+				"balance" : "3000000000000041566",
 				"code" : "0x6000355415600957005b60203560003555",
 				"nonce" : "0x00",
 				"storage" : {
 				}
 			    },
 			    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-				"balance" : "999999999999856920",
+				"balance" : "999999999999858480",
 				"code" : "",
 				"nonce" : "0x01",
 				"storage" : {
diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest40BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest40BCFiller.json
index c530e2ef5..6f5cb9456 100644
--- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest40BCFiller.json
+++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest40BCFiller.json
@@ -65,14 +65,14 @@
 				}
 			    },
 			    "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-				"balance" : "5000000000000065020",
+				"balance" : "3000000000000064240",
 				"code" : "0x6000355415600957005b60203560003555",
 				"nonce" : "0x00",
 				"storage" : {
 				}
 			    },
 			    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-				"balance" : "999999999100116429",
+				"balance" : "999999999100117209",
 				"code" : "",
 				"nonce" : "0x01",
 				"storage" : {
diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest44BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest44BCFiller.json
index 9875d77bb..9807efecd 100644
--- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest44BCFiller.json
+++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest44BCFiller.json
@@ -65,14 +65,14 @@
 				}
 			    },
 			    "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-				"balance" : "5000000000000042037",
+				"balance" : "3000000000000041257",
 				"code" : "0x6000355415600957005b60203560003555",
 				"nonce" : "0x00",
 				"storage" : {
 				}
 			    },
 			    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-				"balance" : "999999999999858009",
+				"balance" : "999999999999858789",
 				"code" : "",
 				"nonce" : "0x01",
 				"storage" : {
diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest56BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest56BCFiller.json
index b9f698ba1..e3097d098 100644
--- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest56BCFiller.json
+++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest56BCFiller.json
@@ -65,14 +65,14 @@
 				}
 			    },
 			    "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-				"balance" : "5000000000000043053",
+				"balance" : "3000000000000041493",
 				"code" : "0x6000355415600957005b60203560003555",
 				"nonce" : "0x00",
 				"storage" : {
 				}
 			    },
 			    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-				"balance" : "999999999999856993",
+				"balance" : "999999999999858553",
 				"code" : "",
 				"nonce" : "0x01",
 				"storage" : {
diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest61BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest61BCFiller.json
index 343489f17..7c81a5e48 100644
--- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest61BCFiller.json
+++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest61BCFiller.json
@@ -63,14 +63,14 @@
 				}
 			    },
 			    "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-				"balance" : "5000000000000028782",
+				"balance" : "3000000000000028002",
 				"code" : "0x6000355415600957005b60203560003555",
 				"nonce" : "0x00",
 				"storage" : {
 				}
 			    },
 			    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-				"balance" : "999999998245065339",
+				"balance" : "999999998245066119",
 				"code" : "",
 				"nonce" : "0x01",
 				"storage" : {
diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest65BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest65BCFiller.json
index 3082ffaea..70c019b9d 100644
--- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest65BCFiller.json
+++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest65BCFiller.json
@@ -89,14 +89,14 @@
 				}
 			    },
 			    "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-				"balance" : "5000000000000075209",
+				"balance" : "3000000000000073649",
 				"code" : "0x6000355415600957005b60203560003555",
 				"nonce" : "0x00",
 				"storage" : {
 				}
 			    },
 			    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-				"balance" : "999999999999824837",
+				"balance" : "999999999999826397",
 				"code" : "",
 				"nonce" : "0x01",
 				"storage" : {
diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest68BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest68BCFiller.json
index ac66f7049..dc1ce75b0 100644
--- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest68BCFiller.json
+++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest68BCFiller.json
@@ -63,14 +63,14 @@
 				}
 			    },
 			    "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-				"balance" : "5000000000000022729",
+				"balance" : "3000000000000021169",
 				"code" : "0x6000355415600957005b60203560003555",
 				"nonce" : "0x00",
 				"storage" : {
 				}
 			    },
 			    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-				"balance" : "999999999999877317",
+				"balance" : "999999999999878877",
 				"code" : "",
 				"nonce" : "0x01",
 				"storage" : {
diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest71BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest71BCFiller.json
index 4619c550f..a2370f7ba 100644
--- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest71BCFiller.json
+++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest71BCFiller.json
@@ -63,14 +63,14 @@
 				}
 			    },
 			    "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-				"balance" : "5000000000000332156",
+				"balance" : "3000000000000330596",
 				"code" : "0x6000355415600957005b60203560003555",
 				"nonce" : "0x00",
 				"storage" : {
 				}
 			    },
 			    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-				"balance" : "999999999999567890",
+				"balance" : "999999999999569450",
 				"code" : "",
 				"nonce" : "0x01",
 				"storage" : {
diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest76BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest76BCFiller.json
index c592fbee0..291724a65 100644
--- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest76BCFiller.json
+++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest76BCFiller.json
@@ -67,14 +67,14 @@
 				}
 			    },
 			    "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-				"balance" : "5000000000000081756",
+				"balance" : "3000000000000080976",
 				"code" : "0x6000355415600957005b60203560003555",
 				"nonce" : "0x00",
 				"storage" : {
 				}
 			    },
 			    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-				"balance" : "999999998225033701",
+				"balance" : "999999998225034481",
 				"code" : "",
 				"nonce" : "0x01",
 				"storage" : {
diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest79BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest79BCFiller.json
index 55da3cf5c..f57f54e5d 100644
--- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest79BCFiller.json
+++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest79BCFiller.json
@@ -65,14 +65,14 @@
 				}
 			    },
 			    "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-				"balance" : "5000000000000048630",
+				"balance" : "3000000000000047850",
 				"code" : "0x6000355415600957005b60203560003555",
 				"nonce" : "0x00",
 				"storage" : {
 				}
 			    },
 			    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-				"balance" : "999999999640166282",
+				"balance" : "999999999640167062",
 				"code" : "",
 				"nonce" : "0x01",
 				"storage" : {
diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest86BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest86BCFiller.json
index df35ce315..361b7c46b 100644
--- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest86BCFiller.json
+++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest86BCFiller.json
@@ -63,14 +63,14 @@
 				}
 			    },
 			    "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-				"balance" : "5000000000000037359",
+				"balance" : "3000000000000036579",
 				"code" : "0x6000355415600957005b60203560003555",
 				"nonce" : "0x00",
 				"storage" : {
 				}
 			    },
 			    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-				"balance" : "999999999011373407",
+				"balance" : "999999999011374187",
 				"code" : "",
 				"nonce" : "0x01",
 				"storage" : {
diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest8BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest8BCFiller.json
index eeeb1e444..444f19082 100644
--- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest8BCFiller.json
+++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest8BCFiller.json
@@ -106,14 +106,14 @@
 				}
 			    },
 			    "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-				"balance" : "5000000000000022091",
+				"balance" : "3000000000000021311",
 				"code" : "0x6000355415600957005b60203560003555",
 				"nonce" : "0x00",
 				"storage" : {
 				}
 			    },
 			    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-				"balance" : "999999999999877955",
+				"balance" : "999999999999878735",
 				"code" : "",
 				"nonce" : "0x01",
 				"storage" : {
diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest91BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest91BCFiller.json
index dc3a63385..b50e86fbb 100644
--- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest91BCFiller.json
+++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest91BCFiller.json
@@ -65,14 +65,14 @@
 				}
 			    },
 			    "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-				"balance" : "5000000000000045749",
+				"balance" : "3000000000000044969",
 				"code" : "0x6000355415600957005b60203560003555",
 				"nonce" : "0x00",
 				"storage" : {
 				}
 			    },
 			    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-				"balance" : "999999997922798360",
+				"balance" : "999999997922799140",
 				"code" : "",
 				"nonce" : "0x01",
 				"storage" : {
diff --git a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest93BCFiller.json b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest93BCFiller.json
index e97487762..df68e7556 100644
--- a/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest93BCFiller.json
+++ b/src/BlockchainTestsFiller/bcRandomBlockhashTest/randomStatetest93BCFiller.json
@@ -63,14 +63,14 @@
 				}
 			    },
 			    "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-				"balance" : "5000000000000022729",
+				"balance" : "3000000000000021169",
 				"code" : "0x6000355415600957005b60203560003555",
 				"nonce" : "0x00",
 				"storage" : {
 				}
 			    },
 			    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-				"balance" : "999999999999877317",
+				"balance" : "999999999999878877",
 				"code" : "",
 				"nonce" : "0x01",
 				"storage" : {
diff --git a/src/BlockchainTestsFiller/bcStateTests/BadStateRootTxBCFiller.json b/src/BlockchainTestsFiller/bcStateTests/BadStateRootTxBCFiller.json
index 68c024e2a..95fd4a891 100644
--- a/src/BlockchainTestsFiller/bcStateTests/BadStateRootTxBCFiller.json
+++ b/src/BlockchainTestsFiller/bcStateTests/BadStateRootTxBCFiller.json
@@ -39,7 +39,7 @@
 		    "network" : ["Byzantium"],
 		    "result" : {
 			    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-				"balance" : "1975583",
+				"balance" : "1976363",
 				"nonce" : "0x01"
 			    }
 		    }
diff --git a/src/BlockchainTestsFiller/bcStateTests/OOGStateCopyContainingDeletedContractFiller.json b/src/BlockchainTestsFiller/bcStateTests/OOGStateCopyContainingDeletedContractFiller.json
index 8446857d9..9a94b2db7 100644
--- a/src/BlockchainTestsFiller/bcStateTests/OOGStateCopyContainingDeletedContractFiller.json
+++ b/src/BlockchainTestsFiller/bcStateTests/OOGStateCopyContainingDeletedContractFiller.json
@@ -84,9 +84,6 @@
 			    "64306ec3f51a26dcf19f5da0c043040f54f4eca5" : {
 				"shouldnotexist" : "1"
 			    },
-			    "8888f1f195afa192cfee860698584c030f4c9db1" : {
-				"balance" : "5000000000001177800"
-			    },
 			    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
 				"nonce" : "0x02"
 			    }
diff --git a/src/BlockchainTestsFiller/bcStateTests/blockhashTestsFiller.json b/src/BlockchainTestsFiller/bcStateTests/blockhashTestsFiller.json
index cdc11197a..27bd9db2c 100644
--- a/src/BlockchainTestsFiller/bcStateTests/blockhashTestsFiller.json
+++ b/src/BlockchainTestsFiller/bcStateTests/blockhashTestsFiller.json
@@ -60,7 +60,7 @@
 			    }
 		       },
 		        "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-		                "balance" : "946582"
+		                "balance" : "948922"
 		            },
 		        "295e7baea6a6c7c4c2dfeb977efac326af552d87" : {
 		                "storage" : {
diff --git a/src/BlockchainTestsFiller/bcStateTests/multimpleBalanceInstructionFiller.json b/src/BlockchainTestsFiller/bcStateTests/multimpleBalanceInstructionFiller.json
index 48c04cebb..1618ee37c 100644
--- a/src/BlockchainTestsFiller/bcStateTests/multimpleBalanceInstructionFiller.json
+++ b/src/BlockchainTestsFiller/bcStateTests/multimpleBalanceInstructionFiller.json
@@ -63,7 +63,7 @@
 		    }
 	    },
 	    {
-		    "network" : ["EIP150", "EIP158", "Byzantium"],
+		    "network" : ["EIP150", "EIP158"],
 		    "result" : {
 			    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
 				"storage" : {
@@ -83,6 +83,28 @@
 				}
 			    }
 		    }
+	    },
+	    {
+		    "network" : ["Byzantium"],
+		    "result" : {
+			    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+				"storage" : {
+				    "0x00" : "0x17485b3218",
+				    "0x02" : "0x17485b3218",
+				    "0x05" : "0x0186aa"
+				}
+			    },
+			    "195e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+				"storage" : {
+				    "0x00" : "0x17484cfc34",
+				    "0x01" : "0x29a2241af63a31fc",
+				    "0x02" : "0x17484cfc34",
+				    "0x03" : "0x29a2241af63a31fc",
+				    "0x04" : "0x0186aa",
+				    "0x05" : "0x018a88"
+				}
+			    }
+		    }
 	    }
         ],
         "pre" : {
diff --git a/src/BlockchainTestsFiller/bcUncleHeaderValidity/correctFiller.json b/src/BlockchainTestsFiller/bcUncleHeaderValidity/correctFiller.json
index bcdb32dd9..59ff6ed93 100644
--- a/src/BlockchainTestsFiller/bcUncleHeaderValidity/correctFiller.json
+++ b/src/BlockchainTestsFiller/bcUncleHeaderValidity/correctFiller.json
@@ -19,7 +19,7 @@
         },
 	"expect" : [
 	    {
-		    "network" : ["ALL"],
+		    "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
 		    "result" : {
 			    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
 				"balance" : "30"
@@ -31,6 +31,20 @@
 				"balance" : "4375000000000000000"
 			    }
 		    }
+	    },
+	    {
+		    "network" : ["Byzantium"],
+		    "result" : {
+			    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+				"balance" : "30"
+			    },
+			    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+				"nonce" : "3"
+			    },
+			    "0000000000000000000000000000000000000000" : {
+				"balance" : "2625000000000000000"
+			    }
+		    }
 	    }
         ],
         "pre" : {
diff --git a/src/BlockchainTestsFiller/bcUncleTest/EqualUncleInTwoDifferentBlocksFiller.json b/src/BlockchainTestsFiller/bcUncleTest/EqualUncleInTwoDifferentBlocksFiller.json
index 529d06d49..0241d0e83 100644
--- a/src/BlockchainTestsFiller/bcUncleTest/EqualUncleInTwoDifferentBlocksFiller.json
+++ b/src/BlockchainTestsFiller/bcUncleTest/EqualUncleInTwoDifferentBlocksFiller.json
@@ -19,7 +19,7 @@
         },
 	"expect" : [
 	    {
-		    "network" : ["ALL"],
+		    "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
 		    "result" : {
 			    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
 				"balance" : "30"
@@ -31,6 +31,20 @@
 				"balance" : "4375000000000000000"
 			    }
 		    }
+	    },
+	    {
+		    "network" : ["Byzantium"],
+		    "result" : {
+			    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+				"balance" : "30"
+			    },
+			    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+				"nonce" : "3"
+			    },
+			    "bcde5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+				"balance" : "2625000000000000000"
+			    }
+		    }
 	    }
         ],
         "pre" : {
diff --git a/src/BlockchainTestsFiller/bcUncleTest/oneUncleGeneration4Filler.json b/src/BlockchainTestsFiller/bcUncleTest/oneUncleGeneration4Filler.json
index de1296a19..265dd4ac5 100644
--- a/src/BlockchainTestsFiller/bcUncleTest/oneUncleGeneration4Filler.json
+++ b/src/BlockchainTestsFiller/bcUncleTest/oneUncleGeneration4Filler.json
@@ -19,7 +19,7 @@
         },
 	"expect" : [
 	    {
-		    "network" : ["ALL"],
+		    "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
 		    "result" : {
 			    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
 				"balance" : "60"
@@ -31,6 +31,20 @@
 				"balance" : "2500000000000000000"
 			    }
 		    }
+	    },
+	    {
+		    "network" : ["Byzantium"],
+		    "result" : {
+			    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+				"balance" : "60"
+			    },
+			    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+				"nonce" : "6"
+			    },
+			    "bcde5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+				"balance" : "1500000000000000000"
+			    }
+		    }
 	    }
         ],
         "pre" : {
diff --git a/src/BlockchainTestsFiller/bcUncleTest/twoUncleFiller.json b/src/BlockchainTestsFiller/bcUncleTest/twoUncleFiller.json
index 9aa71be2e..ee1a99286 100644
--- a/src/BlockchainTestsFiller/bcUncleTest/twoUncleFiller.json
+++ b/src/BlockchainTestsFiller/bcUncleTest/twoUncleFiller.json
@@ -19,7 +19,7 @@
         },
 	"expect" : [
 	    {
-		    "network" : ["ALL"],
+		    "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
 		    "result" : {
 			    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
 				"balance" : "30"
@@ -34,6 +34,23 @@
 				"balance" : "4375000000000000000"
 			    }
 		    }
+	    },
+	    {
+		    "network" : ["Byzantium"],
+		    "result" : {
+			    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+				"balance" : "30"
+			    },
+			    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+				"nonce" : "3"
+			    },
+			    "bcde5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+				"balance" : "2625000000000000000"
+			    },
+			    "ccde5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+				"balance" : "2625000000000000000"
+			    }
+		    }
 	    }
         ],
         "pre" : {
diff --git a/src/BlockchainTestsFiller/bcValidBlockTest/RecallSuicidedContractFiller.json b/src/BlockchainTestsFiller/bcValidBlockTest/RecallSuicidedContractFiller.json
index 35ec66eee..0384d37ab 100644
--- a/src/BlockchainTestsFiller/bcValidBlockTest/RecallSuicidedContractFiller.json
+++ b/src/BlockchainTestsFiller/bcValidBlockTest/RecallSuicidedContractFiller.json
@@ -46,7 +46,7 @@
 		    "network" : ["Byzantium"],
 		    "result" : {
 			    "8888f1f195afa192cfee860698584c030f4c9db1" : {
-				"balance" : "15000000000001210790"
+				"balance" : "9000000000001210790"
 			    }
 		    }
 	    }
diff --git a/src/BlockchainTestsFiller/bcValidBlockTest/RecallSuicidedContractInOneBlockFiller.json b/src/BlockchainTestsFiller/bcValidBlockTest/RecallSuicidedContractInOneBlockFiller.json
index 298a6feb4..893b01049 100644
--- a/src/BlockchainTestsFiller/bcValidBlockTest/RecallSuicidedContractInOneBlockFiller.json
+++ b/src/BlockchainTestsFiller/bcValidBlockTest/RecallSuicidedContractInOneBlockFiller.json
@@ -46,7 +46,7 @@
 		    "network" : ["Byzantium"],
 		    "result" : {
 			    "8888f1f195afa192cfee860698584c030f4c9db1" : {
-				"balance" : "10000000000001210790"
+				"balance" : "6000000000001210790"
 			    }
 		    }
 	    }
diff --git a/src/BlockchainTestsFiller/bcValidBlockTest/dataTx2Filler.json b/src/BlockchainTestsFiller/bcValidBlockTest/dataTx2Filler.json
index ba6811da9..b9fc9939d 100644
--- a/src/BlockchainTestsFiller/bcValidBlockTest/dataTx2Filler.json
+++ b/src/BlockchainTestsFiller/bcValidBlockTest/dataTx2Filler.json
@@ -27,12 +27,20 @@
 		    }
 	    },
 	    {
-		    "network" : ["Homestead", "EIP150", "EIP158", "Byzantium"],
+		    "network" : ["Homestead", "EIP150", "EIP158"],
 		    "result" : {
 			    "8888f1f195afa192cfee860698584c030f4c9db1" : {
 				"balance" : "5000000000005000000"
 			    }
 		    }
+	    },
+	    {
+		    "network" : ["Byzantium"],
+		    "result" : {
+			    "8888f1f195afa192cfee860698584c030f4c9db1" : {
+				"balance" : "3000000000005000000"
+			    }
+		    }
 	    }
         ],
         "pre" : {
diff --git a/src/BlockchainTestsFiller/bcValidBlockTest/dataTxFiller.json b/src/BlockchainTestsFiller/bcValidBlockTest/dataTxFiller.json
index 5e7133ca7..b76752c1e 100644
--- a/src/BlockchainTestsFiller/bcValidBlockTest/dataTxFiller.json
+++ b/src/BlockchainTestsFiller/bcValidBlockTest/dataTxFiller.json
@@ -27,12 +27,20 @@
 		    }
 	    },
 	    {
-		    "network" : ["Homestead", "Byzantium", "EIP150", "EIP158"],
+		    "network" : ["Homestead", "EIP150", "EIP158"],
 		    "result" : {
 			    "8888f1f195afa192cfee860698584c030f4c9db1" : {
 				"balance" : "5000000000000000000"
 			    }
 		    }
+	    },
+	    {
+		    "network" : ["Byzantium"],
+		    "result" : {
+			    "8888f1f195afa192cfee860698584c030f4c9db1" : {
+				"balance" : "3000000000000000000"
+			    }
+		    }
 	    }
         ],
         "pre" : {
diff --git a/src/BlockchainTestsFiller/bcValidBlockTest/gasPrice0Filler.json b/src/BlockchainTestsFiller/bcValidBlockTest/gasPrice0Filler.json
index 609e2944e..e63fcb6ee 100644
--- a/src/BlockchainTestsFiller/bcValidBlockTest/gasPrice0Filler.json
+++ b/src/BlockchainTestsFiller/bcValidBlockTest/gasPrice0Filler.json
@@ -19,7 +19,7 @@
         },
 	"expect" : [
 	    {
-		    "network" : ["ALL"],
+		    "network" : ["Frontier", "Homestead", "EIP150", "EIP158"],
 		    "result" : {
 			    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
 				"balance" : "10"
@@ -28,6 +28,17 @@
 				"balance" : "5000000000000000000"			     
 			    }
 		    }
+	    },
+	    {
+		    "network" : ["Byzantium"],
+		    "result" : {
+			    "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+				"balance" : "10"
+			    },
+			    "8888f1f195afa192cfee860698584c030f4c9db1" : {
+				"balance" : "3000000000000000000"			     
+			    }
+		    }
 	    }
         ],
         "pre" : {
diff --git a/src/GeneralStateTestsFiller/stAttackTest/CrashingTransactionFiller.json b/src/GeneralStateTestsFiller/stAttackTest/CrashingTransactionFiller.json
index 295f60c2a..7270d6756 100644
--- a/src/GeneralStateTestsFiller/stAttackTest/CrashingTransactionFiller.json
+++ b/src/GeneralStateTestsFiller/stAttackTest/CrashingTransactionFiller.json
@@ -1,8 +1,8 @@
 {
     "CrashingTransaction" : {
-	"_info" : {
-	    "comment" : "https://ropsten.etherscan.io/tx/0x8ec445380649f6c75a042a438ea9256c2fab2a6a3437904c9e5a712fcbf8a54a"
-	},
+        "_info" : {
+            "comment" : "https://ropsten.etherscan.io/tx/0x8ec445380649f6c75a042a438ea9256c2fab2a6a3437904c9e5a712fcbf8a54a"
+        },
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stBadOpcode/badOpcodesFiller.json b/src/GeneralStateTestsFiller/stBadOpcode/badOpcodesFiller.json
index fc55e5f6b..d34cb88ff 100644
--- a/src/GeneralStateTestsFiller/stBadOpcode/badOpcodesFiller.json
+++ b/src/GeneralStateTestsFiller/stBadOpcode/badOpcodesFiller.json
@@ -46,128 +46,128 @@
         },
         "transaction" : {
             "data" : [
-"0x60016001600160015800006000f3",
-"0x60016001600160010c60006000f3",
-"0x60016001600160010d60006000f3",
-"0x60016001600160010e60006000f3",
-"0x60016001600160010f60006000f3",
-"0x60016001600160011b60006000f3",
-"0x60016001600160011c60006000f3",
-"0x60016001600160011d60006000f3",
-"0x60016001600160011e60006000f3",
-"0x60016001600160011f60006000f3",
-"0x60016001600160012160006000f3",
-"0x60016001600160012260006000f3",
-"0x60016001600160012360006000f3",
-"0x60016001600160012460006000f3",
-"0x60016001600160012560006000f3",
-"0x60016001600160012660006000f3",
-"0x60016001600160012760006000f3",
-"0x60016001600160012860006000f3",
-"0x60016001600160012960006000f3",
-"0x60016001600160012a60006000f3",
-"0x60016001600160012b60006000f3",
-"0x60016001600160012c60006000f3",
-"0x60016001600160012d60006000f3",
-"0x60016001600160012e60006000f3",
-"0x60016001600160012f60006000f3",
-"0x60016001600160013f60006000f3",
-"0x60016001600160014660006000f3",
-"0x60016001600160014760006000f3",
-"0x60016001600160014860006000f3",
-"0x60016001600160014960006000f3",
-"0x60016001600160014a60006000f3",
-"0x60016001600160014b60006000f3",
-"0x60016001600160014c60006000f3",
-"0x60016001600160014d60006000f3",
-"0x60016001600160014e60006000f3",
-"0x60016001600160014f60006000f3",
-"0x60016001600160015c60006000f3",
-"0x60016001600160015d60006000f3",
-"0x60016001600160015e60006000f3",
-"0x60016001600160015f60006000f3",
-"0x6001600160016001a560006000f3",
-"0x6001600160016001a660006000f3",
-"0x6001600160016001a760006000f3",
-"0x6001600160016001a860006000f3",
-"0x6001600160016001a960006000f3",
-"0x6001600160016001aa60006000f3",
-"0x6001600160016001ab60006000f3",
-"0x6001600160016001ac60006000f3",
-"0x6001600160016001ad60006000f3",
-"0x6001600160016001ae60006000f3",
-"0x6001600160016001af60006000f3",
-"0x6001600160016001b060006000f3",
-"0x6001600160016001b160006000f3",
-"0x6001600160016001b260006000f3",
-"0x6001600160016001b360006000f3",
-"0x6001600160016001b460006000f3",
-"0x6001600160016001b560006000f3",
-"0x6001600160016001b660006000f3",
-"0x6001600160016001b760006000f3",
-"0x6001600160016001b860006000f3",
-"0x6001600160016001b960006000f3",
-"0x6001600160016001ba60006000f3",
-"0x6001600160016001bb60006000f3",
-"0x6001600160016001bc60006000f3",
-"0x6001600160016001bd60006000f3",
-"0x6001600160016001be60006000f3",
-"0x6001600160016001bf60006000f3",
-"0x6001600160016001c060006000f3",
-"0x6001600160016001c160006000f3",
-"0x6001600160016001c260006000f3",
-"0x6001600160016001c360006000f3",
-"0x6001600160016001c460006000f3",
-"0x6001600160016001c560006000f3",
-"0x6001600160016001c660006000f3",
-"0x6001600160016001c760006000f3",
-"0x6001600160016001c860006000f3",
-"0x6001600160016001c960006000f3",
-"0x6001600160016001ca60006000f3",
-"0x6001600160016001cb60006000f3",
-"0x6001600160016001cc60006000f3",
-"0x6001600160016001cd60006000f3",
-"0x6001600160016001ce60006000f3",
-"0x6001600160016001cf60006000f3",
-"0x6001600160016001d060006000f3",
-"0x6001600160016001d160006000f3",
-"0x6001600160016001d260006000f3",
-"0x6001600160016001d360006000f3",
-"0x6001600160016001d460006000f3",
-"0x6001600160016001d560006000f3",
-"0x6001600160016001d660006000f3",
-"0x6001600160016001d760006000f3",
-"0x6001600160016001d860006000f3",
-"0x6001600160016001d960006000f3",
-"0x6001600160016001da60006000f3",
-"0x6001600160016001db60006000f3",
-"0x6001600160016001dc60006000f3",
-"0x6001600160016001dd60006000f3",
-"0x6001600160016001de60006000f3",
-"0x6001600160016001df60006000f3",
-"0x6001600160016001e060006000f3",
-"0x6001600160016001e160006000f3",
-"0x6001600160016001e260006000f3",
-"0x6001600160016001e360006000f3",
-"0x6001600160016001e460006000f3",
-"0x6001600160016001e560006000f3",
-"0x6001600160016001e660006000f3",
-"0x6001600160016001e760006000f3",
-"0x6001600160016001e860006000f3",
-"0x6001600160016001e960006000f3",
-"0x6001600160016001ea60006000f3",
-"0x6001600160016001eb60006000f3",
-"0x6001600160016001ec60006000f3",
-"0x6001600160016001ed60006000f3",
-"0x6001600160016001ee60006000f3",
-"0x6001600160016001ef60006000f3",
-"0x6001600160016001f560006000f3",
-"0x6001600160016001f660006000f3",
-"0x6001600160016001f760006000f3",
-"0x6001600160016001f860006000f3",
-"0x6001600160016001f960006000f3",
-"0x6001600160016001fc60006000f3",
-"0x6001600160016001fe60006000f3"
+"0x600160016001600160016001600160015800006000f3",
+"0x600160016001600160016001600160010c60006000f3",
+"0x600160016001600160016001600160010d60006000f3",
+"0x600160016001600160016001600160010e60006000f3",
+"0x600160016001600160016001600160010f60006000f3",
+"0x600160016001600160016001600160011b60006000f3",
+"0x600160016001600160016001600160011c60006000f3",
+"0x600160016001600160016001600160011d60006000f3",
+"0x600160016001600160016001600160011e60006000f3",
+"0x600160016001600160016001600160011f60006000f3",
+"0x600160016001600160016001600160012160006000f3",
+"0x600160016001600160016001600160012260006000f3",
+"0x600160016001600160016001600160012360006000f3",
+"0x600160016001600160016001600160012460006000f3",
+"0x600160016001600160016001600160012560006000f3",
+"0x600160016001600160016001600160012660006000f3",
+"0x600160016001600160016001600160012760006000f3",
+"0x600160016001600160016001600160012860006000f3",
+"0x600160016001600160016001600160012960006000f3",
+"0x600160016001600160016001600160012a60006000f3",
+"0x600160016001600160016001600160012b60006000f3",
+"0x600160016001600160016001600160012c60006000f3",
+"0x600160016001600160016001600160012d60006000f3",
+"0x600160016001600160016001600160012e60006000f3",
+"0x600160016001600160016001600160012f60006000f3",
+"0x600160016001600160016001600160013f60006000f3",
+"0x600160016001600160016001600160014660006000f3",
+"0x600160016001600160016001600160014760006000f3",
+"0x600160016001600160016001600160014860006000f3",
+"0x600160016001600160016001600160014960006000f3",
+"0x600160016001600160016001600160014a60006000f3",
+"0x600160016001600160016001600160014b60006000f3",
+"0x600160016001600160016001600160014c60006000f3",
+"0x600160016001600160016001600160014d60006000f3",
+"0x600160016001600160016001600160014e60006000f3",
+"0x600160016001600160016001600160014f60006000f3",
+"0x600160016001600160016001600160015c60006000f3",
+"0x600160016001600160016001600160015d60006000f3",
+"0x600160016001600160016001600160015e60006000f3",
+"0x600160016001600160016001600160015f60006000f3",
+"0x60016001600160016001600160016001a560006000f3",
+"0x60016001600160016001600160016001a660006000f3",
+"0x60016001600160016001600160016001a760006000f3",
+"0x60016001600160016001600160016001a860006000f3",
+"0x60016001600160016001600160016001a960006000f3",
+"0x60016001600160016001600160016001aa60006000f3",
+"0x60016001600160016001600160016001ab60006000f3",
+"0x60016001600160016001600160016001ac60006000f3",
+"0x60016001600160016001600160016001ad60006000f3",
+"0x60016001600160016001600160016001ae60006000f3",
+"0x60016001600160016001600160016001af60006000f3",
+"0x60016001600160016001600160016001b060006000f3",
+"0x60016001600160016001600160016001b160006000f3",
+"0x60016001600160016001600160016001b260006000f3",
+"0x60016001600160016001600160016001b360006000f3",
+"0x60016001600160016001600160016001b460006000f3",
+"0x60016001600160016001600160016001b560006000f3",
+"0x60016001600160016001600160016001b660006000f3",
+"0x60016001600160016001600160016001b760006000f3",
+"0x60016001600160016001600160016001b860006000f3",
+"0x60016001600160016001600160016001b960006000f3",
+"0x60016001600160016001600160016001ba60006000f3",
+"0x60016001600160016001600160016001bb60006000f3",
+"0x60016001600160016001600160016001bc60006000f3",
+"0x60016001600160016001600160016001bd60006000f3",
+"0x60016001600160016001600160016001be60006000f3",
+"0x60016001600160016001600160016001bf60006000f3",
+"0x60016001600160016001600160016001c060006000f3",
+"0x60016001600160016001600160016001c160006000f3",
+"0x60016001600160016001600160016001c260006000f3",
+"0x60016001600160016001600160016001c360006000f3",
+"0x60016001600160016001600160016001c460006000f3",
+"0x60016001600160016001600160016001c560006000f3",
+"0x60016001600160016001600160016001c660006000f3",
+"0x60016001600160016001600160016001c760006000f3",
+"0x60016001600160016001600160016001c860006000f3",
+"0x60016001600160016001600160016001c960006000f3",
+"0x60016001600160016001600160016001ca60006000f3",
+"0x60016001600160016001600160016001cb60006000f3",
+"0x60016001600160016001600160016001cc60006000f3",
+"0x60016001600160016001600160016001cd60006000f3",
+"0x60016001600160016001600160016001ce60006000f3",
+"0x60016001600160016001600160016001cf60006000f3",
+"0x60016001600160016001600160016001d060006000f3",
+"0x60016001600160016001600160016001d160006000f3",
+"0x60016001600160016001600160016001d260006000f3",
+"0x60016001600160016001600160016001d360006000f3",
+"0x60016001600160016001600160016001d460006000f3",
+"0x60016001600160016001600160016001d560006000f3",
+"0x60016001600160016001600160016001d660006000f3",
+"0x60016001600160016001600160016001d760006000f3",
+"0x60016001600160016001600160016001d860006000f3",
+"0x60016001600160016001600160016001d960006000f3",
+"0x60016001600160016001600160016001da60006000f3",
+"0x60016001600160016001600160016001db60006000f3",
+"0x60016001600160016001600160016001dc60006000f3",
+"0x60016001600160016001600160016001dd60006000f3",
+"0x60016001600160016001600160016001de60006000f3",
+"0x60016001600160016001600160016001df60006000f3",
+"0x60016001600160016001600160016001e060006000f3",
+"0x60016001600160016001600160016001e160006000f3",
+"0x60016001600160016001600160016001e260006000f3",
+"0x60016001600160016001600160016001e360006000f3",
+"0x60016001600160016001600160016001e460006000f3",
+"0x60016001600160016001600160016001e560006000f3",
+"0x60016001600160016001600160016001e660006000f3",
+"0x60016001600160016001600160016001e760006000f3",
+"0x60016001600160016001600160016001e860006000f3",
+"0x60016001600160016001600160016001e960006000f3",
+"0x60016001600160016001600160016001ea60006000f3",
+"0x60016001600160016001600160016001eb60006000f3",
+"0x60016001600160016001600160016001ec60006000f3",
+"0x60016001600160016001600160016001ed60006000f3",
+"0x60016001600160016001600160016001ee60006000f3",
+"0x60016001600160016001600160016001ef60006000f3",
+"0x60016001600160016001600160016001f560006000f3",
+"0x60016001600160016001600160016001f660006000f3",
+"0x60016001600160016001600160016001f760006000f3",
+"0x60016001600160016001600160016001f860006000f3",
+"0x60016001600160016001600160016001f960006000f3",
+"0x60016001600160016001600160016001fc60006000f3",
+"0x60016001600160016001600160016001fe60006000f3"
             ],
             "gasLimit" : [
                 "400000"
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodeDynamicCodeFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodeDynamicCodeFiller.json
index 2e93ac60d..7f09c9ded 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodeDynamicCodeFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodeDynamicCodeFiller.json
@@ -57,11 +57,11 @@
         "pre" : {
             "1000000000000000000000000000000000000000" : {
                 "balance" : "10000",
-		"//comment1" : "{ (MSTORE 0 0x600160005533601455) (RETURN 23 9) }",
+                "//comment1" : "{ (MSTORE 0 0x600160005533601455) (RETURN 23 9) }",
                 "//comment2" : "{ (MSTORE 0 0x6860016000553360145560005260096017f3) [[ 10 ]] (CREATE 1 14 18) [[ 11 ]] (CALLCODE 100000 0xffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6 0 0 64 0 64 ) }",	
-		"//comment3" : "0x716860016000553360145560005260096017f36000526012600e6001f0600a55604060006040600060007313136008b64ff592819b2fa6d43f2835c452020e620186a0f2600b55",
-		"//comment4" : "            0x0102030405060708091011121314151617181920212223242526272829303132             0x0102030405060708091011121314151617181920212223242526272829303132",
-		"code" : "{ (MSTORE 0 0x716860016000553360145560005260096017f36000526012600e6001f0600a55) (MSTORE 32 0x6040600060406000600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b662)     (MSTORE 64 0x0186a0f2600b5500000000000000000000000000000000000000000000000000) (CREATE 1 0 96) }",
+                "//comment3" : "0x716860016000553360145560005260096017f36000526012600e6001f0600a55604060006040600060007313136008b64ff592819b2fa6d43f2835c452020e620186a0f2600b55",
+                "//comment4" : "            0x0102030405060708091011121314151617181920212223242526272829303132             0x0102030405060708091011121314151617181920212223242526272829303132",
+                "code" : "{ (MSTORE 0 0x716860016000553360145560005260096017f36000526012600e6001f0600a55) (MSTORE 32 0x6040600060406000600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b662)     (MSTORE 64 0x0186a0f2600b5500000000000000000000000000000000000000000000000000) (CREATE 1 0 96) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToExistingContractFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToExistingContractFiller.json
index 8347ac549..511326a72 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToExistingContractFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToExistingContractFiller.json
@@ -31,7 +31,7 @@
             "1000000000000000000000000000000000000000" : {
                 "balance" : "10000",
                 "code" : "{ (MSTORE 0 0x6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b562) (MSTORE 32 0x0186a0f260005500000000000000000000000000000000000000000000000000) (CREATE 1 0 64) }",
-                "code2" : "{ (MSTORE 0 0x6001600155600260025560036003556004600455600560055560066006556007) (MSTORE 32 0x60075560086008556009600955600a600a550000000000000000000000000000) (CREATE 1 0 64) }",
+                "//code2" : "{ (MSTORE 0 0x6001600155600260025560036003556004600455600560055560066006556007) (MSTORE 32 0x60075560086008556009600955600a600a550000000000000000000000000000) (CREATE 1 0 64) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCreateTest/CreateCollisionToEmptyFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CreateCollisionToEmptyFiller.json
index b50c1abde..98496a06f 100644
--- a/src/GeneralStateTestsFiller/stCreateTest/CreateCollisionToEmptyFiller.json
+++ b/src/GeneralStateTestsFiller/stCreateTest/CreateCollisionToEmptyFiller.json
@@ -1,6 +1,6 @@
 {
     "CreateCollisionToEmpty" : {
-	 "_info" : {
+        "_info" : {
             "comment" : "data0 - create collision to empty, data1 - to empty but nonce, data2 - to contract with code"
         },
         "env" : {
diff --git a/src/GeneralStateTestsFiller/stEIP158Specific/EXP_EmptyFiller.json b/src/GeneralStateTestsFiller/stEIP158Specific/EXP_EmptyFiller.json
index a3d8b4560..2bbd6986a 100644
--- a/src/GeneralStateTestsFiller/stEIP158Specific/EXP_EmptyFiller.json
+++ b/src/GeneralStateTestsFiller/stEIP158Specific/EXP_EmptyFiller.json
@@ -17,24 +17,24 @@
                 },
                 "network" : ["EIP158"],
                 "result" : {
-		    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-			"comment" : "https://etherpad.net/p/EIP158",
-		        "storage" : {
-		            "0x00" : "0x08d5b6",
-		            "0x02" : "0x0873c4",
-		            "0x03" : "0x01",
-		            "0x04" : "0x07d76c",
-		            "0x06" : "0x07741c",
-		            "0x08" : "0x070f3c",
-		            "0x0a" : "0x06a73c",
-		            "0x0b" : "0x01",
-		            "0x0c" : "0x060ae4",
-		            "0x0d" : "0x01",
-		            "0x0e" : "0x056e8c",
-		            "0x0f" : "0x01",
-		            "0x64" : "0x04d234"
-		        }
-		    }
+                "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                    "//comment" : "https://etherpad.net/p/EIP158",
+                    "storage" : {
+                        "0x00" : "0x08d5b6",
+                        "0x02" : "0x0873c4",
+                        "0x03" : "0x01",
+                        "0x04" : "0x07d76c",
+                        "0x06" : "0x07741c",
+                        "0x08" : "0x070f3c",
+                        "0x0a" : "0x06a73c",
+                        "0x0b" : "0x01",
+                        "0x0c" : "0x060ae4",
+                        "0x0d" : "0x01",
+                        "0x0e" : "0x056e8c",
+                        "0x0f" : "0x01",
+                        "0x64" : "0x04d234"
+                    }
+                }
                 }
             },
 	    {
@@ -45,24 +45,24 @@
                 },
                 "network" : ["EIP150"],
                 "result" : {
-		    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-			"comment" : "https://etherpad.net/p/EIP158",
-		        "storage" : {
-		            "0x00" : "0x08d5b6",
-		            "0x02" : "0x0873ec",
-		            "0x03" : "0x01",
-		            "0x04" : "0x07d794",
-		            "0x06" : "0x077584",
-		            "0x08" : "0x071324",
-		            "0x0a" : "0x06b024",
-		            "0x0b" : "0x01",
-		            "0x0c" : "0x0613cc",
-		            "0x0d" : "0x01",
-		            "0x0e" : "0x057774",
-		            "0x0f" : "0x01",
-		            "0x64" : "0x04db1c"
-		        }
-		    }
+                "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                    "//comment" : "https://etherpad.net/p/EIP158",
+                    "storage" : {
+                        "0x00" : "0x08d5b6",
+                        "0x02" : "0x0873ec",
+                        "0x03" : "0x01",
+                        "0x04" : "0x07d794",
+                        "0x06" : "0x077584",
+                        "0x08" : "0x071324",
+                        "0x0a" : "0x06b024",
+                        "0x0b" : "0x01",
+                        "0x0c" : "0x0613cc",
+                        "0x0d" : "0x01",
+                        "0x0e" : "0x057774",
+                        "0x0f" : "0x01",
+                        "0x64" : "0x04db1c"
+                    }
+                }
                 }
             },
 	    {
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexpFiller.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexpFiller.json
index 4c6fb07c1..f4a227da6 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexpFiller.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexpFiller.json
@@ -280,7 +280,8 @@
 		"28 - base length 4TiB",
 		"29 - exp length 4TiB; returns 0 because mod is zero",
 		"30 - base and mod have zero-length.  exp's length is 2^255.  Since mod is zero, the result should be zero.",
-		"31,32,33,34,35 - something that should result in 1."
+		"31,32,33,34,35 - something that should result in 1.",
+		"36 - the input found on 10 Oct. 2017 that overflows the gas calculation"
 	    ],
             "data" : [
                 "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
@@ -318,7 +319,8 @@
 "0x0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000cd935b43e42204fcbfb734a6e27735e8e90204fcc1fd2727bb040f9eecb",
 "0x0000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060846813a8d2d451387340fa0597c6545ae63",
 "0x0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d02534f82b1013f20d9c7d18d62cd95674d2e013f20d9c7d18d62cd95674d2f",
-"0x0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d"
+"0x0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+"0x00000000000000000000000000000000000000000000000000000000000000ff2a1e5300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit" : [
                 "100000000", "90000", "110000", "200000"
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover0Filler.json
index 7136455a2..7136455a2 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover0_0inputFiller.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover0_0inputFiller.json
index 7e2fbaab9..7e2fbaab9 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover0_0inputFiller.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover0_0inputFiller.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover0_Gas2999Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover0_Gas2999Filler.json
index 30ad405a2..30ad405a2 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover0_Gas2999Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover0_Gas2999Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover0_NoGasFiller.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover0_NoGasFiller.json
index 91d09fe62..91d09fe62 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover0_NoGasFiller.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover0_NoGasFiller.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover0_completeReturnValueFiller.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover0_completeReturnValueFiller.json
index 708250e99..708250e99 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover0_completeReturnValueFiller.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover0_completeReturnValueFiller.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover0_gas3000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover0_gas3000Filler.json
index db73a6ca3..db73a6ca3 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover0_gas3000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover0_gas3000Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover0_overlappingInputOutputFiller.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover0_overlappingInputOutputFiller.json
index c0873b2d8..c0873b2d8 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover0_overlappingInputOutputFiller.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover0_overlappingInputOutputFiller.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover1Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover1Filler.json
index db3ca08f0..db3ca08f0 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover1Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover1Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover2Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover2Filler.json
index a011a6df1..a011a6df1 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover2Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover2Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover3Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover3Filler.json
index 0bff7880e..0bff7880e 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover3Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover3Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover80Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover80Filler.json
index a1e9905bf..a1e9905bf 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover80Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover80Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecoverH_prefixed0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecoverH_prefixed0Filler.json
index 43f7d149b..43f7d149b 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecoverH_prefixed0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecoverH_prefixed0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecoverR_prefixed0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecoverR_prefixed0Filler.json
index 273810a2c..273810a2c 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecoverR_prefixed0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecoverR_prefixed0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecoverS_prefixed0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecoverS_prefixed0Filler.json
index 9ee916a0a..9ee916a0a 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecoverS_prefixed0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecoverS_prefixed0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecoverV_prefixed0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecoverV_prefixed0Filler.json
index 817074da9..817074da9 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecoverV_prefixed0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecoverV_prefixed0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecoverV_prefixedf0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecoverV_prefixedf0Filler.json
index 5d5a6cd87..5d5a6cd87 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecoverV_prefixedf0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecoverV_prefixedf0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentitiy_0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEIdentitiy_0Filler.json
index 47f3c139c..47f3c139c 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentitiy_0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEIdentitiy_0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentitiy_1Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEIdentitiy_1Filler.json
index aee2484dc..aee2484dc 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentitiy_1Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEIdentitiy_1Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentity_1_nonzeroValueFiller.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEIdentity_1_nonzeroValueFiller.json
index e9f86fd2b..e9f86fd2b 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentity_1_nonzeroValueFiller.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEIdentity_1_nonzeroValueFiller.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentity_2Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEIdentity_2Filler.json
index f33e4dbe8..f33e4dbe8 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentity_2Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEIdentity_2Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentity_3Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEIdentity_3Filler.json
index 76e96cb21..76e96cb21 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentity_3Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEIdentity_3Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentity_4Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEIdentity_4Filler.json
index 1e4391a03..1e4391a03 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentity_4Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEIdentity_4Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentity_4_gas17Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEIdentity_4_gas17Filler.json
index b9451cf17..b9451cf17 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentity_4_gas17Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEIdentity_4_gas17Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentity_4_gas18Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEIdentity_4_gas18Filler.json
index f4ae482ef..f4ae482ef 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentity_4_gas18Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEIdentity_4_gas18Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentity_5Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEIdentity_5Filler.json
index 0dd51174e..0dd51174e 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentity_5Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEIdentity_5Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODERipemd160_0Filler.json
index f410e41a6..f410e41a6 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODERipemd160_0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_1Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODERipemd160_1Filler.json
index 501614e59..501614e59 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_1Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODERipemd160_1Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_2Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODERipemd160_2Filler.json
index 0ffc2ddc0..0ffc2ddc0 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_2Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODERipemd160_2Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_3Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODERipemd160_3Filler.json
index c0c4a3408..c0c4a3408 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_3Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODERipemd160_3Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_3_postfixed0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODERipemd160_3_postfixed0Filler.json
index 53a43e180..53a43e180 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_3_postfixed0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODERipemd160_3_postfixed0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_3_prefixed0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODERipemd160_3_prefixed0Filler.json
index 887a55eec..887a55eec 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_3_prefixed0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODERipemd160_3_prefixed0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_4Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODERipemd160_4Filler.json
index 8a292fdc3..8a292fdc3 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_4Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODERipemd160_4Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_4_gas719Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODERipemd160_4_gas719Filler.json
index c680a70a9..c680a70a9 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_4_gas719Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODERipemd160_4_gas719Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_5Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODERipemd160_5Filler.json
index f54bb91ed..f54bb91ed 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_5Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODERipemd160_5Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_0Filler.json
index 296dd2843..296dd2843 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_1Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_1Filler.json
index 1eb97d8c5..1eb97d8c5 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_1Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_1Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_1_nonzeroValueFiller.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_1_nonzeroValueFiller.json
index f6468ff1d..f6468ff1d 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_1_nonzeroValueFiller.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_1_nonzeroValueFiller.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_2Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_2Filler.json
index 266f060d3..266f060d3 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_2Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_2Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_3Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_3Filler.json
index 499210a00..499210a00 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_3Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_3Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_3_postfix0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_3_postfix0Filler.json
index 4aabd2aee..4aabd2aee 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_3_postfix0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_3_postfix0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_3_prefix0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_3_prefix0Filler.json
index d35a6caf6..d35a6caf6 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_3_prefix0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_3_prefix0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_4Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_4Filler.json
index 7b06d9cb5..7b06d9cb5 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_4Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_4Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_4_gas99Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_4_gas99Filler.json
index 48ba78555..48ba78555 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_4_gas99Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_4_gas99Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_5Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_5Filler.json
index e9cda7ae9..e9cda7ae9 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_5Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_5Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover0Filler.json
index bd7894d31..bd7894d31 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover0_0inputFiller.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover0_0inputFiller.json
index 045388b8e..045388b8e 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover0_0inputFiller.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover0_0inputFiller.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover0_Gas2999Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover0_Gas2999Filler.json
index c01460855..c01460855 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover0_Gas2999Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover0_Gas2999Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover0_NoGasFiller.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover0_NoGasFiller.json
index 7216cd270..7216cd270 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover0_NoGasFiller.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover0_NoGasFiller.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover0_completeReturnValueFiller.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover0_completeReturnValueFiller.json
index 3d1165f71..3d1165f71 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover0_completeReturnValueFiller.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover0_completeReturnValueFiller.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover0_gas3000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover0_gas3000Filler.json
index 0bf2e9fa8..0bf2e9fa8 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover0_gas3000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover0_gas3000Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover0_overlappingInputOutputFiller.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover0_overlappingInputOutputFiller.json
index 41aa4e9da..41aa4e9da 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover0_overlappingInputOutputFiller.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover0_overlappingInputOutputFiller.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover1Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover1Filler.json
index f37851a92..f37851a92 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover1Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover1Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover2Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover2Filler.json
index 41ff8a91a..41ff8a91a 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover2Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover2Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover3Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover3Filler.json
index 28c014950..28c014950 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover3Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover3Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover80Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover80Filler.json
index 55e3d3f89..55e3d3f89 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover80Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover80Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverCheckLengthFiller.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecoverCheckLengthFiller.json
index 207efd046..207efd046 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverCheckLengthFiller.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecoverCheckLengthFiller.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverCheckLengthWrongVFiller.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecoverCheckLengthWrongVFiller.json
index 969c6d178..969c6d178 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverCheckLengthWrongVFiller.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecoverCheckLengthWrongVFiller.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverH_prefixed0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecoverH_prefixed0Filler.json
index b7658fa67..b7658fa67 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverH_prefixed0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecoverH_prefixed0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverR_prefixed0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecoverR_prefixed0Filler.json
index c48798e71..c48798e71 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverR_prefixed0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecoverR_prefixed0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverS_prefixed0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecoverS_prefixed0Filler.json
index 47208abfa..47208abfa 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverS_prefixed0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecoverS_prefixed0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverV_prefixed0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecoverV_prefixed0Filler.json
index 80b567602..80b567602 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverV_prefixed0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecoverV_prefixed0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentitiy_0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallIdentitiy_0Filler.json
index bf79da3f2..bf79da3f2 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentitiy_0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallIdentitiy_0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentitiy_1Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallIdentitiy_1Filler.json
index a25ddb3db..a25ddb3db 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentitiy_1Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallIdentitiy_1Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentity_1_nonzeroValueFiller.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallIdentity_1_nonzeroValueFiller.json
index ed72b1cdf..ed72b1cdf 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentity_1_nonzeroValueFiller.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallIdentity_1_nonzeroValueFiller.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentity_2Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallIdentity_2Filler.json
index 9a055cc9c..9a055cc9c 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentity_2Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallIdentity_2Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentity_3Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallIdentity_3Filler.json
index e40e05d3b..e40e05d3b 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentity_3Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallIdentity_3Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentity_4Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallIdentity_4Filler.json
index d85670220..d85670220 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentity_4Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallIdentity_4Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentity_4_gas17Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallIdentity_4_gas17Filler.json
index c6b9f1765..c6b9f1765 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentity_4_gas17Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallIdentity_4_gas17Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentity_4_gas18Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallIdentity_4_gas18Filler.json
index 4c5574853..4c5574853 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentity_4_gas18Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallIdentity_4_gas18Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentity_5Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallIdentity_5Filler.json
index 2da071597..2da071597 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentity_5Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallIdentity_5Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallRipemd160_0Filler.json
index ace3c43fa..ace3c43fa 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallRipemd160_0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_1Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallRipemd160_1Filler.json
index 33c2e23cd..33c2e23cd 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_1Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallRipemd160_1Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_2Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallRipemd160_2Filler.json
index f71847c9d..f71847c9d 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_2Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallRipemd160_2Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_3Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallRipemd160_3Filler.json
index c22baf08f..c22baf08f 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_3Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallRipemd160_3Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_3_postfixed0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallRipemd160_3_postfixed0Filler.json
index d23539204..d23539204 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_3_postfixed0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallRipemd160_3_postfixed0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_3_prefixed0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallRipemd160_3_prefixed0Filler.json
index 16f8dea23..16f8dea23 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_3_prefixed0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallRipemd160_3_prefixed0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_4Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallRipemd160_4Filler.json
index c34093ad0..c34093ad0 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_4Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallRipemd160_4Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_4_gas719Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallRipemd160_4_gas719Filler.json
index 4e5978ce1..4e5978ce1 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_4_gas719Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallRipemd160_4_gas719Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_5Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallRipemd160_5Filler.json
index d8ff9d8ed..d8ff9d8ed 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_5Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallRipemd160_5Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_0Filler.json
index 41eb75167..41eb75167 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_1Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_1Filler.json
index 03335c6ec..03335c6ec 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_1Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_1Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_1_nonzeroValueFiller.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_1_nonzeroValueFiller.json
index adb320629..adb320629 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_1_nonzeroValueFiller.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_1_nonzeroValueFiller.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_2Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_2Filler.json
index d0421c90c..d0421c90c 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_2Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_2Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_3Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_3Filler.json
index c5c397bf6..c5c397bf6 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_3Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_3Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_3_postfix0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_3_postfix0Filler.json
index 2f48bfa12..2f48bfa12 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_3_postfix0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_3_postfix0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_3_prefix0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_3_prefix0Filler.json
index 59f66adcc..59f66adcc 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_3_prefix0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_3_prefix0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_4Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_4Filler.json
index f14994040..f14994040 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_4Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_4Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_4_gas99Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_4_gas99Filler.json
index b3ceb81d6..b3ceb81d6 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_4_gas99Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_4_gas99Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_5Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_5Filler.json
index c1dc83b27..c1dc83b27 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_5Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_5Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts2/modexpRandomInputFiller.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/modexpRandomInputFiller.json
new file mode 100644
index 000000000..bc6f3057a
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/modexpRandomInputFiller.json
@@ -0,0 +1,82 @@
+{
+    "modexpRandomInput": {
+	"_info" : {
+	    "comment" : "Fuzzed input discovered by Guido"
+	},
+        "env": {
+            "currentCoinbase": "0x3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
+            "currentGasLimit": "0x5f5e100",
+            "currentNumber": "0x1",
+            "currentTimestamp": "1000",
+            "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
+        },
+        "expect": [
+            {
+                "indexes" : {
+                    "data" : 0,
+                    "gas" : 0,
+                    "value" : -1
+                },
+                "network" : ["Byzantium"],
+                "result" : {
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "999999999999999977128"
+                    }
+                }
+            },
+	         {
+                "indexes" : {
+                    "data" : 1,
+                    "gas" : 0,
+                    "value" : -1
+                },
+                "network" : ["Byzantium"],
+                "result" : {
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "999999999999999290000"
+                    }
+                }
+            },
+	         {
+                "indexes" : {
+                    "data" : 2,
+                    "gas" : 1,
+                    "value" : -1
+                },
+                "network" : ["Byzantium"],
+                "result" : {
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "999999999999993000000"
+                    }
+                }
+            }
+        ],
+        "pre": {
+	    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000000000000",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
+        "transaction": {
+            "data": [
+"0x00000000000000000000000000000000000000000000000000000000000000e300000000000000000000000000000000000000000000000000",
+"0x00000000008000000000000000000000000000000000000000000000000000000000000400000000000000000000000a",
+"0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001147000000000000000000000000000000000000000000000000000000000061660350000000000000000000000000000000000000000000000000000000000000008"
+            ],
+            "gasLimit": [
+                "710000", "7000000"
+            ],
+            "gasPrice": "1",
+            "nonce": "0",
+            "secretKey": "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+	         "to": "0x0000000000000000000000000000000000000005",
+            "value": [
+                "0x"
+            ]
+        }
+    }
+}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_20500Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/modexp_0_0_0_20500Filler.json
index d2670426d..d2670426d 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_20500Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/modexp_0_0_0_20500Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_22000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/modexp_0_0_0_22000Filler.json
index a11ab17b0..a11ab17b0 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_22000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/modexp_0_0_0_22000Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_25000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/modexp_0_0_0_25000Filler.json
index 2b783669f..2b783669f 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_25000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/modexp_0_0_0_25000Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_35000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/modexp_0_0_0_35000Filler.json
index 8bab8127c..8bab8127c 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_35000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/modexp_0_0_0_35000Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest384Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest384Filler.json
index 401b6b424..401b6b424 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest384Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest384Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest385Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest385Filler.json
index 232177fa0..232177fa0 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest385Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest385Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest386Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest386Filler.json
index a9f8eb972..a9f8eb972 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest386Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest386Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest387Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest387Filler.json
index feea1931b..feea1931b 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest387Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest387Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest388Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest388Filler.json
index bea4abc6e..bea4abc6e 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest388Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest388Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest389Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest389Filler.json
index 4e6ec1cbb..4e6ec1cbb 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest389Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest389Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest391Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest391Filler.json
index e69d0ee95..e69d0ee95 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest391Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest391Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest393Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest393Filler.json
index 5ad4de27f..5ad4de27f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest393Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest393Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest395Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest395Filler.json
index 902223d78..902223d78 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest395Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest395Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest396Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest396Filler.json
index 48d3c112f..48d3c112f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest396Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest396Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest397Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest397Filler.json
index 404d7f8ee..404d7f8ee 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest397Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest397Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest398Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest398Filler.json
index c953b751f..c953b751f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest398Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest398Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest399Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest399Filler.json
index 7ebbdbdde..7ebbdbdde 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest399Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest399Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest401Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest401Filler.json
index aca275cc5..aca275cc5 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest401Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest401Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest402Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest402Filler.json
index 21d50e2a5..21d50e2a5 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest402Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest402Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest404Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest404Filler.json
index ca8213c16..ca8213c16 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest404Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest404Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest405Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest405Filler.json
index a46b86253..a46b86253 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest405Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest405Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest406Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest406Filler.json
index 2e09a51b9..2e09a51b9 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest406Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest406Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest407Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest407Filler.json
index fc5e33de5..fc5e33de5 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest407Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest407Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest408Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest408Filler.json
index 11faf389c..11faf389c 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest408Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest408Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest409Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest409Filler.json
index 7dc2f18e1..7dc2f18e1 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest409Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest409Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest410Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest410Filler.json
index fc0c904aa..fc0c904aa 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest410Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest410Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest411Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest411Filler.json
index af2c1a8bc..af2c1a8bc 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest411Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest411Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest412Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest412Filler.json
index 6dc4d9a66..6dc4d9a66 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest412Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest412Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest413Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest413Filler.json
index 77cda38af..77cda38af 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest413Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest413Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest414Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest414Filler.json
index 768e73c5f..768e73c5f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest414Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest414Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest415Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest415Filler.json
index 78819cfe5..78819cfe5 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest415Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest415Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest416Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest416Filler.json
index 6e19e82f5..6e19e82f5 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest416Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest416Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest417Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest417Filler.json
index 29667a646..29667a646 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest417Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest417Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest418Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest418Filler.json
index 8dc903456..8dc903456 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest418Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest418Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest419Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest419Filler.json
index 2ec3a4a81..2ec3a4a81 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest419Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest419Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest420Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest420Filler.json
index 175a89c84..175a89c84 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest420Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest420Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest421Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest421Filler.json
index fc3323cf7..fc3323cf7 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest421Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest421Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest422Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest422Filler.json
index eb827b0c3..eb827b0c3 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest422Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest422Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest423Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest423Filler.json
index aa9050887..aa9050887 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest423Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest423Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest424Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest424Filler.json
index c8f2c6b72..c8f2c6b72 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest424Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest424Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest425Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest425Filler.json
index 0a5d927e2..0a5d927e2 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest425Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest425Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest426Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest426Filler.json
index 736778116..736778116 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest426Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest426Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest428Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest428Filler.json
index ba58282a1..ba58282a1 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest428Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest428Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest429Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest429Filler.json
index 982f38138..982f38138 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest429Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest429Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest430Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest430Filler.json
index 617cdc014..617cdc014 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest430Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest430Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest433Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest433Filler.json
index f470c1d0e..f470c1d0e 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest433Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest433Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest435Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest435Filler.json
index 2d721368e..2d721368e 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest435Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest435Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest436Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest436Filler.json
index 1a8cde4fa..1a8cde4fa 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest436Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest436Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest437Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest437Filler.json
index 9ed83f97f..9ed83f97f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest437Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest437Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest438Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest438Filler.json
index c323e20de..c323e20de 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest438Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest438Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest439Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest439Filler.json
index 4a8222233..4a8222233 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest439Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest439Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest440Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest440Filler.json
index 2a1ce3591..2a1ce3591 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest440Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest440Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest441Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest441Filler.json
index 216cb8137..216cb8137 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest441Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest441Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest442Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest442Filler.json
index 024900278..024900278 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest442Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest442Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest443Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest443Filler.json
index e0965e269..e0965e269 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest443Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest443Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest444Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest444Filler.json
index b26e5db15..b26e5db15 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest444Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest444Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest445Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest445Filler.json
index 998b20d3b..998b20d3b 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest445Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest445Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest446Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest446Filler.json
index 2d42090d6..2d42090d6 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest446Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest446Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest447Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest447Filler.json
index ee583b35b..ee583b35b 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest447Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest447Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest448Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest448Filler.json
index 1a39335c9..1a39335c9 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest448Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest448Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest449Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest449Filler.json
index b392bc6bc..b392bc6bc 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest449Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest449Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest450Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest450Filler.json
index 0ef4455ad..0ef4455ad 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest450Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest450Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest451Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest451Filler.json
index aaf9b2ec0..aaf9b2ec0 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest451Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest451Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest452Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest452Filler.json
index b321656da..b321656da 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest452Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest452Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest454Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest454Filler.json
index 0f7be34eb..0f7be34eb 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest454Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest454Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest455Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest455Filler.json
index 97bbe4dfb..97bbe4dfb 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest455Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest455Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest456Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest456Filler.json
index ff8177fda..ff8177fda 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest456Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest456Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest457Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest457Filler.json
index e211aec22..e211aec22 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest457Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest457Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest458Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest458Filler.json
index 671c22a75..671c22a75 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest458Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest458Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest460Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest460Filler.json
index 2e5c73786..2e5c73786 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest460Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest460Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest461Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest461Filler.json
index 6c79dcaee..6c79dcaee 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest461Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest461Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest462Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest462Filler.json
index cc21a2f04..cc21a2f04 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest462Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest462Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest464Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest464Filler.json
index 294421414..294421414 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest464Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest464Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest465Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest465Filler.json
index 5ae851a35..5ae851a35 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest465Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest465Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest466Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest466Filler.json
index 40de4db02..40de4db02 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest466Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest466Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest467Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest467Filler.json
index 7e1c127f7..7e1c127f7 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest467Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest467Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest468Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest468Filler.json
index 10a5a7be9..10a5a7be9 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest468Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest468Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest469Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest469Filler.json
index a9af46b29..a9af46b29 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest469Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest469Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest470Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest470Filler.json
index b129d0ff9..b129d0ff9 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest470Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest470Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest471Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest471Filler.json
index 008dfe6bb..008dfe6bb 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest471Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest471Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest472Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest472Filler.json
index 6fa8bf422..6fa8bf422 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest472Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest472Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest473Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest473Filler.json
index 25d06ed4e..25d06ed4e 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest473Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest473Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest474Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest474Filler.json
index 2ca69f6d6..2ca69f6d6 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest474Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest474Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest475Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest475Filler.json
index 4c34a92ad..4c34a92ad 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest475Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest475Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest476Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest476Filler.json
index 910780b16..910780b16 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest476Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest476Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest477Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest477Filler.json
index b541d5846..b541d5846 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest477Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest477Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest478Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest478Filler.json
index 785d40443..785d40443 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest478Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest478Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest480Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest480Filler.json
index 223086d3f..223086d3f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest480Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest480Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest481Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest481Filler.json
index e120720e3..e120720e3 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest481Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest481Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest482Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest482Filler.json
index 1fde33c23..1fde33c23 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest482Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest482Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest483Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest483Filler.json
index 35de82ec9..35de82ec9 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest483Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest483Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest484Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest484Filler.json
index dc0038b85..dc0038b85 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest484Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest484Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest485Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest485Filler.json
index 42715b544..42715b544 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest485Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest485Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest487Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest487Filler.json
index 08d7a2b1d..08d7a2b1d 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest487Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest487Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest488Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest488Filler.json
index 32380a28a..32380a28a 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest488Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest488Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest489Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest489Filler.json
index a484aab76..a484aab76 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest489Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest489Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest491Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest491Filler.json
index 7253afebd..7253afebd 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest491Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest491Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest493Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest493Filler.json
index 67be31cbe..67be31cbe 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest493Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest493Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest494Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest494Filler.json
index 9a8f63276..9a8f63276 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest494Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest494Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest495Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest495Filler.json
index 79826f5f8..79826f5f8 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest495Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest495Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest496Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest496Filler.json
index b571d3ee2..b571d3ee2 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest496Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest496Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest497Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest497Filler.json
index e046d6d35..e046d6d35 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest497Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest497Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest498Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest498Filler.json
index a988f8df2..a988f8df2 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest498Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest498Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest499Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest499Filler.json
index bf0c09f1c..bf0c09f1c 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest499Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest499Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest500Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest500Filler.json
index 941c9a48b..941c9a48b 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest500Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest500Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest501Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest501Filler.json
index ff3506e7f..ff3506e7f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest501Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest501Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest502Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest502Filler.json
index 85f5f0c2f..85f5f0c2f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest502Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest502Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest503Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest503Filler.json
index 76e144354..76e144354 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest503Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest503Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest504Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest504Filler.json
index 82c2d0de3..82c2d0de3 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest504Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest504Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest505Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest505Filler.json
index 3cb1d6eea..3cb1d6eea 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest505Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest505Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest506Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest506Filler.json
index e6610024e..e6610024e 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest506Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest506Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest507Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest507Filler.json
index f99cbd50f..f99cbd50f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest507Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest507Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest508Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest508Filler.json
index 8514ac09f..8514ac09f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest508Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest508Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest509Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest509Filler.json
index da792d866..da792d866 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest509Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest509Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest510Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest510Filler.json
index 2a2588941..2a2588941 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest510Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest510Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest511Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest511Filler.json
index d8be66d44..d8be66d44 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest511Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest511Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest512Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest512Filler.json
index 41d396721..41d396721 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest512Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest512Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest513Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest513Filler.json
index 808c4fbae..808c4fbae 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest513Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest513Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest514Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest514Filler.json
index 09a6bd444..09a6bd444 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest514Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest514Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest516Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest516Filler.json
index 4435f8478..4435f8478 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest516Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest516Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest517Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest517Filler.json
index b8435601d..b8435601d 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest517Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest517Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest518Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest518Filler.json
index 4cb72be6d..4cb72be6d 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest518Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest518Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest519Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest519Filler.json
index 8932c4bc3..8932c4bc3 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest519Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest519Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest520Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest520Filler.json
index 18bfc2021..18bfc2021 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest520Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest520Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest521Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest521Filler.json
index 1959f7853..1959f7853 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest521Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest521Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest523Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest523Filler.json
index 43d1b311e..43d1b311e 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest523Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest523Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest524Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest524Filler.json
index b8af171f0..b8af171f0 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest524Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest524Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest525Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest525Filler.json
index 773fcd932..773fcd932 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest525Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest525Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest526Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest526Filler.json
index 3947e4df4..3947e4df4 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest526Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest526Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest527Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest527Filler.json
index e8e6f70b1..e8e6f70b1 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest527Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest527Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest528Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest528Filler.json
index 3f3d3b281..3f3d3b281 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest528Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest528Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest531Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest531Filler.json
index a05a28132..a05a28132 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest531Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest531Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest532Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest532Filler.json
index 398f9de27..398f9de27 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest532Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest532Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest533Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest533Filler.json
index fbda16511..fbda16511 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest533Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest533Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest534Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest534Filler.json
index 14317d6ec..14317d6ec 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest534Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest534Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest535Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest535Filler.json
index 8575fe049..8575fe049 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest535Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest535Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest536Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest536Filler.json
index a16fc5aa6..a16fc5aa6 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest536Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest536Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest537Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest537Filler.json
index dd7644000..dd7644000 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest537Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest537Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest538Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest538Filler.json
index 8803cb19f..8803cb19f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest538Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest538Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest539Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest539Filler.json
index 8e9d345d9..8e9d345d9 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest539Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest539Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest541Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest541Filler.json
index ca615c974..ca615c974 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest541Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest541Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest542Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest542Filler.json
index 0045cac3c..0045cac3c 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest542Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest542Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest543Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest543Filler.json
index dc2293655..dc2293655 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest543Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest543Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest544Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest544Filler.json
index 585b5c672..585b5c672 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest544Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest544Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest545Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest545Filler.json
index 150235188..150235188 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest545Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest545Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest546Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest546Filler.json
index f344c6a78..f344c6a78 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest546Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest546Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest547Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest547Filler.json
index 5a241e518..5a241e518 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest547Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest547Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest548Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest548Filler.json
index 492471b94..492471b94 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest548Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest548Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest549Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest549Filler.json
index 21197ca85..21197ca85 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest549Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest549Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest550Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest550Filler.json
index 3bca50981..3bca50981 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest550Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest550Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest552Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest552Filler.json
index 29ee20ae1..29ee20ae1 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest552Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest552Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest553Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest553Filler.json
index 7430dabb7..7430dabb7 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest553Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest553Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest554Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest554Filler.json
index 75e3dc3e1..75e3dc3e1 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest554Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest554Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest555Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest555Filler.json
index 3575de2f5..3575de2f5 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest555Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest555Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest556Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest556Filler.json
index 1efacd699..1efacd699 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest556Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest556Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest558Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest558Filler.json
index 7b1090378..7b1090378 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest558Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest558Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest559Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest559Filler.json
index 43178dab9..43178dab9 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest559Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest559Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest560Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest560Filler.json
index b7be035d4..b7be035d4 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest560Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest560Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest562Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest562Filler.json
index 2e685e14a..2e685e14a 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest562Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest562Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest563Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest563Filler.json
index 023dd14a8..023dd14a8 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest563Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest563Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest564Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest564Filler.json
index e18ff9166..e18ff9166 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest564Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest564Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest565Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest565Filler.json
index a9a267575..a9a267575 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest565Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest565Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest566Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest566Filler.json
index fc4336ae8..fc4336ae8 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest566Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest566Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest567Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest567Filler.json
index adafc93d6..adafc93d6 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest567Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest567Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest569Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest569Filler.json
index 171d4ce22..171d4ce22 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest569Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest569Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest571Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest571Filler.json
index 50be61eba..50be61eba 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest571Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest571Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest572Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest572Filler.json
index 867cee653..867cee653 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest572Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest572Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest573Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest573Filler.json
index 1fa2408a5..1fa2408a5 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest573Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest573Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest574Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest574Filler.json
index 25484ed8a..25484ed8a 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest574Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest574Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest575Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest575Filler.json
index cc4c0d999..cc4c0d999 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest575Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest575Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest576Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest576Filler.json
index e3bfbaee8..e3bfbaee8 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest576Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest576Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest577Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest577Filler.json
index 2d6d6d91b..2d6d6d91b 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest577Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest577Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest578Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest578Filler.json
index b3497f099..b3497f099 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest578Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest578Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest579Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest579Filler.json
index 235361bfe..235361bfe 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest579Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest579Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest580Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest580Filler.json
index bef7a4ca9..bef7a4ca9 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest580Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest580Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest581Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest581Filler.json
index 9f4c08172..9f4c08172 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest581Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest581Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest582Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest582Filler.json
index dd8f09011..dd8f09011 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest582Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest582Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest583Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest583Filler.json
index 309e4d6bf..309e4d6bf 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest583Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest583Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest584Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest584Filler.json
index 05a8d5ed0..05a8d5ed0 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest584Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest584Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest585Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest585Filler.json
index 412ac5f3c..412ac5f3c 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest585Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest585Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest586Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest586Filler.json
index 343546533..343546533 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest586Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest586Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest587Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest587Filler.json
index 541e9fd40..541e9fd40 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest587Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest587Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest588Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest588Filler.json
index 3f6c3c1ac..3f6c3c1ac 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest588Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest588Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest589Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest589Filler.json
index d78d22811..d78d22811 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest589Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest589Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest592Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest592Filler.json
index 624be0102..624be0102 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest592Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest592Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest594Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest594Filler.json
index 5660090b6..5660090b6 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest594Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest594Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest596Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest596Filler.json
index e33ce4879..e33ce4879 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest596Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest596Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest597Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest597Filler.json
index df9a51164..df9a51164 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest597Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest597Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest599Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest599Filler.json
index 31aae7e73..31aae7e73 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest599Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest599Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest600Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest600Filler.json
index b97120374..b97120374 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest600Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest600Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest601Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest601Filler.json
index a6a3dafbc..a6a3dafbc 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest601Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest601Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest602Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest602Filler.json
index c40d7175f..c40d7175f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest602Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest602Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest603Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest603Filler.json
index 0e29b48a6..0e29b48a6 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest603Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest603Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest604Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest604Filler.json
index b4b49227f..b4b49227f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest604Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest604Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest605Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest605Filler.json
index 38f132fbe..38f132fbe 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest605Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest605Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest607Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest607Filler.json
index 427c7386f..427c7386f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest607Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest607Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest608Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest608Filler.json
index b7b40c9db..b7b40c9db 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest608Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest608Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest609Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest609Filler.json
index 4e1702b10..4e1702b10 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest609Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest609Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest610Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest610Filler.json
index d9b732de5..d9b732de5 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest610Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest610Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest611Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest611Filler.json
index 7c0c8f82a..7c0c8f82a 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest611Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest611Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest612Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest612Filler.json
index 0ab6252b7..0ab6252b7 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest612Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest612Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest615Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest615Filler.json
index 0790e6111..0790e6111 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest615Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest615Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest616Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest616Filler.json
index 57ddef909..57ddef909 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest616Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest616Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest618Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest618Filler.json
index a2d84e4eb..a2d84e4eb 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest618Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest618Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest619Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest619Filler.json
index 1ae16d41c..1ae16d41c 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest619Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest619Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest620Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest620Filler.json
index efa2030f2..efa2030f2 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest620Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest620Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest621Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest621Filler.json
index eaf3a0b3f..eaf3a0b3f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest621Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest621Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest624Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest624Filler.json
index d67a20585..d67a20585 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest624Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest624Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest625Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest625Filler.json
index 66a7f66eb..66a7f66eb 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest625Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest625Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest626Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest626Filler.json
index d6be6791e..d6be6791e 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest626Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest626Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest627Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest627Filler.json
index 3bc3bdc78..3bc3bdc78 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest627Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest627Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest628Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest628Filler.json
index f701b49f4..f701b49f4 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest628Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest628Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest629Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest629Filler.json
index fb6d4d020..fb6d4d020 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest629Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest629Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest630Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest630Filler.json
index 4f799f894..4f799f894 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest630Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest630Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest632Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest632Filler.json
index 5b686f30e..5b686f30e 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest632Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest632Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest633Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest633Filler.json
index d2c5fe754..d2c5fe754 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest633Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest633Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest635Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest635Filler.json
index c8f1336b6..c8f1336b6 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest635Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest635Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest636Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest636Filler.json
index c7079d58b..c7079d58b 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest636Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest636Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest637Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest637Filler.json
index 6e8ce82ff..6e8ce82ff 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest637Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest637Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest638Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest638Filler.json
index 54549c34a..54549c34a 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest638Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest638Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest639Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest639Filler.json
index fec8dc5b0..fec8dc5b0 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest639Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest639Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest640Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest640Filler.json
index db0bc9e52..db0bc9e52 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest640Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest640Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest641Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest641Filler.json
index b2bc4ed4d..b2bc4ed4d 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest641Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest641Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest642Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest642Filler.json
index 5c745d975..5c745d975 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest642Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest642Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest643Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest643Filler.json
index 2d1dd7953..2d1dd7953 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest643Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest643Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest644Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest644Filler.json
index 85c7dd7e3..85c7dd7e3 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest644Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest644Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest645Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest645Filler.json
index e80dd93d3..e80dd93d3 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest645Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest645Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest646Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest646Filler.json
index 6edc63c79..6edc63c79 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest646Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest646Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom2/randomStatetest647Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest647Filler.json
new file mode 100644
index 000000000..f35af6633
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest647Filler.json
@@ -0,0 +1,61 @@
+{
+    "randomStatetest647" : {
+        "_info" : {
+            "comment" : "Malicious bytecode found by fuzztest tool: returndatacopy(0,-1)"
+        },
+	"env":{
+		"currentCoinbase":"0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+		"currentDifficulty":"0x20000",
+		"currentGasLimit":"0x42fe8c95373ea1",
+		"currentNumber":"0x01",
+		"currentTimestamp":"0x03e8",
+		"previousHash":"0xb9cdadfa4eb6b43788795e580e7cb36b4c85348412173e7bb3b9e7e954f7949f"
+	},
+	"expect" : [
+		{
+		        "indexes" : {
+		            "data" : -1,
+		            "gas" : -1,
+		            "value" : -1
+		        },
+		        "network" : ["Byzantium"],
+		        "result" : {
+		        	"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b":{
+					"balance":"994213071"
+				}
+		        }
+   		}
+	],
+	"pre":{
+		"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b":{
+			"balance":"1000000000",
+			"code":"",
+			"nonce":"0x00",
+			"storage":{
+			}
+		},
+		"0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b":{
+			"balance":"0x00",
+			"code":"0x6001600160000360003e00",
+			"nonce":"0x07",
+			"storage":{
+			}
+		}
+	},
+	"transaction":{
+		"data":[
+			""
+		],
+		"gasLimit":[
+			"0x584d31"
+		],
+		"gasPrice":"0x01",
+		"nonce":"0x00",
+		"secretKey":"0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+		"to":"0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+		"value":[
+			"0x00"
+		]
+	}
+  }
+}
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetestFiller.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetestFiller.json
index a69471a4f..a69471a4f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetestFiller.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetestFiller.json
diff --git a/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_0_0_following_successful_createFiller.json b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_0_0_following_successful_createFiller.json
index 0d7c02a66..c6f1f2a1f 100644
--- a/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_0_0_following_successful_createFiller.json
+++ b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_0_0_following_successful_createFiller.json
@@ -22,7 +22,7 @@
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                        "shouldexist" : false
+                        "shouldnotexist" : "1"
                     }
                 }
             },
diff --git a/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_afterFailing_createFiller.json b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_afterFailing_createFiller.json
new file mode 100644
index 000000000..638691070
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_afterFailing_createFiller.json
@@ -0,0 +1,64 @@
+{
+    "returndatacopy_afterFailing_create" : {
+	"_info" : {
+	    "comment" : "Returndatacopy after failing create case due to 0xfd code."
+	}, 
+        "env" : {
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x20000",
+            "currentGasLimit" : "0x0a00000000",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "expect" : [
+            {   "indexes" : {
+                   "data" : -1,
+                   "gas" : -1,
+                   "value" : -1
+                },
+                "network" : ["Byzantium"],
+                "result" : {
+                    "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                        "storage" : {
+                            "0x00" : "0x20",
+			    "0x01" : "0x02"
+                        }
+                    }
+                }
+            }
+        ],
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x00",
+                "code" : "{ (MSTORE 0 0x600260005260206000fd) (create 0 22 10) (SSTORE 0 (RETURNDATASIZE)) (RETURNDATACOPY 0 0 32) (SSTORE 1 (MLOAD 0)) }",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "0x0a00000000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "value" : [
+                "0x00"
+            ]
+        }
+    }
+}
diff --git a/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_following_too_big_transferFiller.json b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_following_too_big_transferFiller.json
index 27bba6316..a42400913 100644
--- a/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_following_too_big_transferFiller.json
+++ b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_following_too_big_transferFiller.json
@@ -1,8 +1,8 @@
 {
     "returndatacopy_following_too_big_transfer" : {
-	"_info" : {
-	    "comment" : "This test tries RETURNDATACOPY with a non-zero size after a CALL that fails because of insufficient balance."
-	},
+        "_info" : {
+            "comment" : "This test tries RETURNDATACOPY with a non-zero size after a CALL that fails because of insufficient balance."
+        },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stReturnDataTest/returndatasize_after_oog_after_deeperFiller.json b/src/GeneralStateTestsFiller/stReturnDataTest/returndatasize_after_oog_after_deeperFiller.json
new file mode 100644
index 000000000..d2266b335
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stReturnDataTest/returndatasize_after_oog_after_deeperFiller.json
@@ -0,0 +1,98 @@
+{
+    "returndatasize_after_oog_after_deeper" : {
+        "_info" : {
+            "commment" : "transaction calls A (CALL B(CALL C(RETURN) OOG) 'check buffers')"
+        },
+        "env" : {
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x20000",
+            "currentGasLimit" : "0x0a00000000",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance": "0x1000000000",
+                "code": "",
+                "nonce": "0x0",
+                "storage": {}
+            },
+            "0x1000000000000000000000000000000000000001": {
+                "balance" : "0x00",
+                "code": "{ (seq (SSTORE 2 (CALL 100000 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 32)) (SSTORE 0 (RETURNDATASIZE))) (SSTORE 1 (MLOAD 0))}",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xffffffff",
+                    "0x01" : "0xffffffff",
+                    "0x02" : "0xffffffff"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x100000000000",
+                "code" : "{ (seq (CALL 100000 0xbb00000000000000000000000000000000000000 0 0 0 0 0) (while 1 (SSTORE 0 1)) )}",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xbb00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "{ (seq (MSTORE 0 255) (RETURN 0 32) )}",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "expect": [
+            {
+                "indexes" : {
+                   "data" : -1,
+                   "gas" : -1,
+                   "value" : -1
+                },
+                "network" : ["Byzantium", "Constantinople"],
+                "result" : {
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x00" : "0x00",
+                            "0x01" : "0x00",
+                            "0x02" : "0x00"
+                        }
+                    }
+                }
+            },
+            {
+                "indexes" : {
+                   "data" : -1,
+                   "gas" : -1,
+                   "value" : -1
+                },
+                "network" : ["Frontier", "Homestead", "EIP158"],
+                "result" : {
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x00" : "0xffffffff",
+                            "0x01" : "0xffffffff",
+                            "0x02" : "0xffffffff"
+                        }
+                    }
+                }
+            }
+        ],
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "0x0a00000000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to":  "0x1000000000000000000000000000000000000001",
+            "value" : [
+                "0x00"
+            ]
+        }
+    }
+}
diff --git a/src/GeneralStateTestsFiller/stReturnDataTest/returndatasize_bugFiller.json b/src/GeneralStateTestsFiller/stReturnDataTest/returndatasize_bugFiller.json
new file mode 100644
index 000000000..1684943e1
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stReturnDataTest/returndatasize_bugFiller.json
@@ -0,0 +1,89 @@
+{
+    "returndatasize_bug" : {
+	"_info" : {
+	    "comment" : "RETURNDATASIZE after a failing CALL (due to insufficient balance) should return 0"
+	},
+        "env" : {
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x20000",
+            "currentGasLimit" : "0x0a00000000",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "expect" : [
+            {   "indexes" : {
+                   "data" : -1,
+                   "gas" : -1,
+                   "value" : -1
+                },
+                "network" : ["EIP150", "EIP158", "Frontier", "Homestead"],
+                "result" : {
+                    "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    }
+                }
+            },
+            {   "indexes" : {
+                   "data" : -1,
+                   "gas" : -1,
+                   "value" : -1
+                },
+                "network" : ["Byzantium"],
+                "result" : {
+                    "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                        "storage" : {
+                            "0x00" : "0x00"
+                        }
+                    },
+		    "0x1f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                        "storage" : {
+                            "0x01" : "0x00"
+                        }
+                    }
+                }
+            }
+        ],
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "{ (CALL 1 0x1f572e5295c57f15886f9b263e2f6d2d6c7b5ec6 50000 0 0 0 0) (SSTORE 0 (RETURNDATASIZE)) }",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0",
+                "code" : "{ (CALL 10 1 50000 0 0 0 0) (SSTORE 1 1) }",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "0x0a00000000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "value" : [
+                "0x00"
+            ]
+        }
+    }
+}
diff --git a/src/GeneralStateTestsFiller/stRevertTest/PythonRevertTestTue201814-1430Filler.json b/src/GeneralStateTestsFiller/stRevertTest/PythonRevertTestTue201814-1430Filler.json
new file mode 100644
index 000000000..b7120c172
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stRevertTest/PythonRevertTestTue201814-1430Filler.json
@@ -0,0 +1,62 @@
+{
+  "PythonRevertTestTue201814-1430": {
+    "_info" : {
+	"comment" : "A random test that had failed in Python ethereum implementation"
+    },
+    "pre": {
+      "0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+        "code": "0x6102fa60ff60f561014873c94f5374fce5edbc8e2a8697c15331677e6ebf0b630277795afa689497edb6a665eae52f3d625249756103a55260a860fb60cb3e6102dd6103e0fd6f568a159c0cae9044d258c55b10f4d100628d29ab781df7fcebb789e2a8cdbaa9c67c42cd1ebe81716ead0e94c7216d279dd3a0b3de311596d54729287873449ccce511e6991b3dc636a178159a3d9a06227462cd9a6768ccba17c2cb06de468e95730bf78e55af17e19973f2c3f5d4c21c169890b9a9672491f91aa1e7142667060d385ed594e21b6d02b23a6c4c50e7ab6a3ef66f83a2927f9845b4ba85c4fdfbd0054a0123ad93eff4b525b0f4b08d285f36f3bcac6a985b66906c348472b7cb047bc5a02e618666f0c50eecdc11f20fc1dc41c2fd957752e55ede4e56f469f536a04d436ad418a1ca7a44c0173c10f1806ba284f9c9c7c13670005de594dec538cd56c2746b3bfdfa7683ae0df68bbcb5347d61be606ef617322e6448e3e4124dbe061257a8f486529de397f08ce92502a37b957f855818082b5b5b49e36de5a83e8a270663088571bf2fdf8f5f2961031452326fb9499741e3859928a237f5e5df84c13c6043556b1e82328f9093e64defbdd07d7774d84835800999791abc41260472d96f604d07198e859adc0b70806beae7200cf116d2b55e89ddd564abc36d900e69a68b0f0e9e4f129987288153605d7d01c42f3b109ed2bd72a6cf13500241c2a5e5c4e17ea9ed9b05ba9b57d70d63d270ece77f6ecf21d3a41ad554f79584dcab761d4c8437774cad4bb13b2bece140358df93e76c0f49abe102cd44e474ab71c0237247865fa2add74c8b2a33d6f7041c5718a2554a72662720296dff5b377b559df4558b8a5b2c9e7d15eb3947a70064f935c8fdf0a4e726f644aa31b42c10280e50ea92a366c3d060c1270c6a16a75522fbeb3d7cca702807f5217816eab9cceb9e237ee8fde4ed3a23d3ec87adb334ac1caa7e06523b0132dd615cf3fc16140d34c191617823c3a7bf47c42bc36b69cb4385463595c7f6f9ea451e05303603e0cd401e13d6ff744e2a673824d943941551704ff14df7fa8646efbb2d8abc4ac6e258e9924924b8001f8f0650d66b37411d484b18f41e77c792bd1c169fa52bbfc8af4a45f20acb0ef95db2ecbc0d4eadbbbf6732f648bd33b36336dc0faf0cf1970bcd38093a50a44fd6b253b0e74f2706239c499217b8c3263dae332e254711d5d5e7e795c998cceed14cf46977e7d3cbb35783c79ef0530c3a8ac3fd8d49f10bb0ae919fa149adead67dae035627de430622813ac6271b51873b94f5374fce5edbc8e2a8697c15331677e6ebf0b3c7fb9ba628e056e0e87e029b8e5f42821d775338e6774301ecb428b3938236ee22b7d0b5edf2ad6997869f427ba0672a7168614233e85f61dae5ed4283a53f60570116dad586dce62833a62ca8c914c641f8660526101d761010761031c73c94f5374fce5edbc8e2a8697c15331677e6ebf0b6333d3d55ff4611a5b631c4ea729816102566103ce6101c161014a73000000000000000000000000000000000000000663202b2ea8f4610221610106602e3e648a95029ecb72849fe0943cb9d854c7d50ad04cfdfe648e286876b8f2b53e55fe01a152c8496cbcc6997447062b734cebde04796c6452e9efc4aba5bf071cbff56208a525a8ef5f52399b4f33697bd988884f58166d734881774eff46d77bb189c89c55b1c6591f178d2d7c21bf2b023adf9bc5b8621235e3346d98d56047a3f71241fd5a24abbb0c73fc463fb8a5e67e32055696fe51258dd07526ebd87e439bcebb514ae26dc12d653a5c1263705109097ec5dcdb3918ab114985f7097fd3003b50e58fba91007825a6b800f644eaa306051808460fc3b2d8e276b2187c7b583ff29ee0b0c34f9ee57bac9ebb996402e3300ddf06c760fc5f531f746b1e2beda7a15c07f90f92422822e8d33c5d2409ea7375197f7cd6d61770eddb078206cfc7c5006cd0e97da9ec65fa4fc683da22cfaf6dfc995feb5f8386a052851fc502f32e7ef9346e3d4633def4c0a4b9be12f2cd7c646062e14ca37cfb977524f677714c3d994ea05f1997a2462fc0ab20ed2a5958f37126029b6102056102c9605d6103a173b94f5374fce5edbc8e2a8697c15331677e6ebf0b6302e83dbef4",
+        "nonce": "0x1d",
+        "balance": "0x845252b8509dc215",
+        "storage": {}
+      },
+      "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+        "code": "0x7abee2a270429abbd3ff3b9945f72f58dcf4f8b344417a87dfa1ebd7601f5232609b6103ee61027b6101326342a46f5073b94f5374fce5edbc8e2a8697c15331677e6ebf0b632c1e2816f26101726101ec61013161012473d94f5374fce5edbc8e2a8697c15331677e6ebf0b632318d76ffa7201a0ff381bb40bb828d7781d2ef7c0fd8695f77c05465fbadf99fdffef2afd94b0e76531b6ea0d23d2332d13c20368a072644e41bc113079a6b1ebc3464527e34c26a4379f9dfe4f8e57981a9fc08558c90d537538079f1921b60fe6fa448171fec55c4c63e81171221164cf72f489a45775e83a2f5427eab647b075a910929de0a6554fc1426b49547acd8e2c770339616ce9c501fb746715dd4a20219229d0673ac055997e3bd089a6663f6dff488574195b848fbb357eb7be1fff076e997770d03b7028536103b36102846103056102db73b94f5374fce5edbc8e2a8697c15331677e6ebf0b6347cfe65df4423a6b8679871dc28aa5a1399b21c86102e460476101f3605b73ffffffffffffffffffffffffffffffffffffffff6311ecd01bfa76afa8155ecd75dd05f9d7eb42fa3e79c6a2109dff2a1e5361030a6101b2fd610263605861011761027f63459d135b7300000000000000000000000000000000000000056342ce224df274e612fbe000bed18eec8345f005f537c72820d8b97360e3526b50ae523a8f7467ae14a8bd9a6aaee55862b685e32476cc6762ae2c4068cf55729540d111f44c9260e76101bc6103f33e68639458dae7ad2a9b38629ed3bb1060d861036afd610123610359636db4b55bf0626021696101775263ea8a7b3a641bcf9219191a6103be6103716101f73e74c0413cb5d609ca9a51645238e4f1f8268f973c3a0169a0b67479a345d1e700655360166101736102f2610214633ff89b317300000000000000000000000000000000000000066335adeabdf13d7ee6d218af54c3d8045447d06c726801695cfa26fdfaa6460a8685cd662855a5547f5716140ae0b1e25aeaf04ae7cf54e8aa7a22206da5a6e52bdd3ef82ad40a46815177d25811167b0a3f66a727652592924dc1291a6085d537c5da6101b1601d6103a33e752d6272a54f882460bc76407d6361c40cc56bc88a8bc960726103ec6102c16101f3731000000000000000000000000000000000000000635f449586f4",
+        "nonce": "0x1d",
+        "balance": "0x882fd85bc18c9f00",
+        "storage": {}
+      },
+      "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+        "code": "",
+        "nonce": "0x00",
+        "balance": "0xab56295c9d120548",
+        "storage": {}
+      },
+      "0x1000000000000000000000000000000000000000": {
+        "code": "0x601361019f6101013e6f338db2b1165b4918f178852663192a956d79a68b50eefdc639ca0b62ab4d52771db054ccc801c0666b34b3c6242bbfc5e98f20c14fb95e016718be9ad033d50e21675ff59297861847ea6a911a6a9d135e2f826dc6037d850e0db21d105b8732a34b873c7d943050b8659794f0bd3e841d35a2231e65f697f8cde1176728fa2051e87933cf66858e4e5e91baa7764fc1e9ffe4c7b15ba600e88f095989dc68f47ed704be2b99601761021563200fbd63f07e41c7f86732f4d5419b41e6887cca98e0943f141a5c66df98bd0c6d6c4cec657893afaa8ce1769c96cd0751aa76a98c8196fa8c92e70d7bda176299c91c3e7a7f05de3181109b8194387746f9ec15a6e0233f759e43360bd4e0a06e4e9f395117afcd072774ce12d13dc761016152303a683305858002a92140b678508e3a3be377d4825dbf618a393c7c061e75a8a496a33afe0f72017f2e33549e321838b083d48893f23dced4597e2e9ea08fe3f80970d6334b6c6f1fde8bcc81d03a7ccc244231cb6606dba6d06ec1c5158ef0db6994192acbd4cac6ab6ac8449d80fc2c32471946e071d9606bd390266d7f712766f4765076283ad6687450d7ab4df6f3f6ee9661014a70b802ec9d7ed96dc0b9ce7bd14b193dc1f05376d11ce19283c7f651d4d2e7c180715ff7fcbc995ea8b2766213cc517d6dad16d17f29a93220ce0ddb0a65d3d474dbc39cba5bcb3d4fcf9fef1910607d64c04511df277f522ab2475fbb2ba0720711a903dbecfa0429bf11e6e90cbb0f13d4ee050c52c87365e0216b4096186fc604fb563fa59f1263ee91d5695e407fdffe82ca1558f7876a93f3a218dd9ba6901fdea93d6be498f0b0e1874331115e31aa6fad4d87227362a9ec3e1c1be11cdb2309697bbc0c692eeadfa9161669b8aec24564487dc74f8e7d17e6a133b5dbe576838697de73f856197203ef1a3a54f7edb0dbd60f9d5274db6b5c1477169b77f0d817ed731a20db4b9e5b83d2786bffefab084a31c4afda168156612f281da0be688e5bdb1f3176ed78bc62343a7665abad6573482449e68b3acfe820993d77df5785384d51aaa0612dab5ddbf2a9bf550736ad422933878861011961023ffd608f61022d61021661036e635af7465b73ffffffffffffffffffffffffffffffffffffffff63792c6916f16ed70693587df6ccfae5218d01559bac60156102006101adfd",
+        "nonce": "0x15",
+        "balance": "0x5b1936a53e6e440f",
+        "storage": {}
+      },
+      "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+        "code": "0x610326610100f379c940b5f2046740058558468f238b85db7f6bbe3f3d51e92a3e3268b7f7c4147541c695f376705288410b81b217e80726fb9e4c5c7b4c49eca0c1b6b97e117c16c26c9816459f38396ffc36da48d65defdc7d055cbc846c07e81cfab0fb607c6cbc968774d4de7df8e3236f581e688cc2081a96b1cad9e0609b70f4fddda49ae97714e7d325ceab23acd5f46ba15b5210474116121921a04f68f3f933b9ad91b735bf71bfe41da706499c5d47b6de1fe398cb91fdf66481cbb8661d71d457cf3cef75dabf5ea496d7012f4c56b9fe70e6c4204720e3ce66874cead08499d57a547b97d37744ce205e051f296fb116fc9e5f3c280919aff3c93c5d5cefff9a6102d86103ca6364b68c8ef07d",
+        "nonce": "0x1d",
+        "balance": "0x054c814f188394c8",
+        "storage": {}
+      }
+    },
+    "env": {
+      "currentNumber": "0x01",
+      "currentDifficulty": "0x20000",
+      "currentTimestamp": "0x03e8",
+      "currentGasLimit": "0x14a0583da74c9c",
+      "currentCoinbase": "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+      "previousHash": "0xbe3aaa6657719af4fbf6b9741d3c2c1eca7446e7b87ce36eb18a407fca527573"
+    },
+    "transaction": {
+      "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+      "gasLimit": [
+        "0x2857ab"
+      ],
+      "nonce": "0x00",
+      "value": [
+        "0x254ffcc0"
+      ],
+      "to": "0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+      "gasPrice": "0x02",
+      "data": [
+        "0x66a9b45d44c78cfe774333fe0c49418dd61f183d41132f5340e48ababb825a26eb0a75c0ca693a8b465121200fd21a7b4c365a65a3255278f672705e5ca0f6146fccd36a6e5b9decfb6e5096887651e829313a2cc9d5b518e25861c31ba04ed3f5a3310bd966993aa534b00785778d9545342410ce8c156d780a8cb4a65efed30aa9d6bd63c4778a134c9cb0c677ecda48aacef0c191de37e3cfdae69153747c2406995ea81bbae6a201663b9b37a6a9f597ae4f40e44e74ea92616bc2956328ced0d77412c265c2925470320e5f285d15a08a263b0a444516817c266bd51fe726677144df3c080d07dd47c4eb9e44a87541ddc5a697163260a06921033eb3542b375cd0d073dfb48f6acde07152794b5539563efff1afed3b0a6b15166526175e7184b83cc2de68df61ec5d65d1eee66ea376fcb84f2c73335db9fba49e3d40638cd7f462f1d3b315f17b8dc1f692a68b2431b166ee71a4ba159dd322b9fa5f3237dfb85d2594056102f261025b61021d6101d3631fe4bdc373ffffffffffffffffffffffffffffffffffffffff631ea09dc6f263edd580947c8177bd72d2244f7652371e3428d28bc6356c553b18d00e6b3cf60206c273abbd7763059f61940b0d19fde33f7b5a96080d25791e9ae89c718dd41c3f57b0c304fbb83978de28d23499bdd19c0472301ff527ccc9f7ed74a8dbd906b468d448fba77f38f193e3047b02e40beb08b4f11707681ef103ec1b00585a85f27227a179f15e7e97a359268b06ff34bcee23a869974fbca6e201cb16179743ac0f8c9f8603d570e26a5aad5217ebfff3140716923723efaa79b6cd87fbc9fd408d4ac5a048e43fb4e7a2b94053bf1fb7257562977725cde415738a99e1a7690cbe409744b737367dedc82e3063516c5bc57e35fcb2038306d9a3a6e46103515279ddcb9d30879e470f5dd81e1148184f62bd61ae9708ff61cee25c63694a73437a42be5043b1fde117ba383682ba0d91e0db8b29c882a044d0c8bb49056a25a66d8480df1b1ccc2564791df94f43d5802aa8f44bf70a6817ed784e5725bdc7718a54d6a567234286085240ba847d575dac25d7fc32c59999a9d38fee0d25e7c23986009c5bb022f7d28a2cab6e01a4bb37dd42ea42d5141d55f5730c7bd82bf08bff3928aea77e7153bcc4a3a53996be367ec98cb6fe85797e771d020284d4d302c8b4ebe6b28a9c64a9ae2ad6894716732f6b245e7fdc5243f79a0ae9b8d874900caa1c5796a2854ceddb00a82b4ec01b513ed61c72ce89400a06fe90a109bad6d5e028143e7552937a0136347eb71a49db0072c87bd437b9cd7b2f7e6e9f3a85875c9ede6036650f9d06d4c2e8692caf2e87043c0bf5a2359c66431acbb35dcbfc6a7b86074b99c9e6f959d8417784e5e40c854c280218c0cd4e98dc3bc44f7d651d7191ead455"
+      ]
+    }
+  }
+}
diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json
index 22e183874..21297119a 100644
--- a/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json
+++ b/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json
@@ -31,7 +31,7 @@
                 }
             },
 	    {
-		"comment" : "OOG in subcall",
+                "//comment" : "OOG in subcall",
                 "indexes" : {
                     "data" : 0,
                     "gas" : 1,
@@ -39,12 +39,12 @@
                 },
                 "network" : ["ALL"],
                 "result" : {
-		    "3e180b1862f9d158abb5e519a6d8605540c23682" : {
-		        "balance" : "0x06",
+                    "3e180b1862f9d158abb5e519a6d8605540c23682" : {
+                        "balance" : "0x06",
                         "code" : "{ [[0]] 1 [[1]] (CALL (CALLDATALOAD 0) 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[4]] 12 }",
                         "nonce" : "54",
                         "storage" : {
-			    "0x00" : "0x01",
+                            "0x00" : "0x01",
                             "0x04" : "0x0c"
                         }
 		    },
@@ -55,7 +55,7 @@
                 }
             },
 	    {
-		"comment" : "OOG after subcall",
+                "//comment" : "OOG after subcall",
                 "indexes" : {
                     "data" : 1,
                     "gas" : 0,
@@ -63,8 +63,8 @@
                 },
                 "network" : ["EIP158", "EIP150"],
                 "result" : {
-		    "3e180b1862f9d158abb5e519a6d8605540c23682" : {
-		        "balance" : "0x05",
+                    "3e180b1862f9d158abb5e519a6d8605540c23682" : {
+                        "balance" : "0x05",
                         "code" : "{ [[0]] 1 [[1]] (CALL (CALLDATALOAD 0) 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[4]] 12 }",
                         "nonce" : "54",
                         "storage" : {
@@ -77,7 +77,7 @@
                 }
             },
 	    {
-		"comment" : "OOG after subcall",
+                "//comment" : "OOG after subcall",
                 "indexes" : {
                     "data" : 1,
                     "gas" : 0,
@@ -85,8 +85,8 @@
                 },
                 "network" : ["Homestead", "Frontier"],
                 "result" : {
-		    "3e180b1862f9d158abb5e519a6d8605540c23682" : {
-		        "balance" : "0x05",
+                    "3e180b1862f9d158abb5e519a6d8605540c23682" : {
+                        "balance" : "0x05",
                         "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
                         "nonce" : "54",
                         "storage" : {
@@ -99,7 +99,7 @@
                 }
             },
 	    {
-		"comment" : "double OOG",
+                "//comment" : "double OOG",
                 "indexes" : {
                     "data" : 0,
                     "gas" : 0,
@@ -107,9 +107,9 @@
                 },
                 "network" : ["ALL"],
                 "result" : {
-		    "3e180b1862f9d158abb5e519a6d8605540c23682" : {
-		        "balance" : "0x05",
-                "code" : "{ [[0]] 1 [[1]] (CALL (CALLDATALOAD 0) 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[4]] 12 }",
+                    "3e180b1862f9d158abb5e519a6d8605540c23682" : {
+                        "balance" : "0x05",
+                        "code" : "{ [[0]] 1 [[1]] (CALL (CALLDATALOAD 0) 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[4]] 12 }",
                         "nonce" : "54",
                         "storage" : {
                         }
diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateOOGFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateOOGFiller.json
index 2e7aa1ea4..47b0db599 100644
--- a/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateOOGFiller.json
@@ -10,7 +10,7 @@
         },
         "expect" : [
             {
-		"comment" : "NO OOG",
+                "//comment" : "NO OOG",
                 "indexes" : {
                     "data" : 1,
                     "gas" : 1,
@@ -18,10 +18,10 @@
                 },
                 "network" : ["EIP158"],
                 "result" : {
-		    "3e180b1862f9d158abb5e519a6d8605540c23682" : {
-			"nonce" : "1"
-		     },
-		    "a000000000000000000000000000000000000000" : {
+                    "3e180b1862f9d158abb5e519a6d8605540c23682" : {
+                    "nonce" : "1"
+                     },
+                    "a000000000000000000000000000000000000000" : {
                         "storage" : {
                             "0x00" : "0x01",
                             "0x01" : "0x01",
@@ -37,7 +37,7 @@
                 }
             },
 	    {
-		"comment" : "NO OOG",
+                "//comment" : "NO OOG",
                 "indexes" : {
                     "data" : 1,
                     "gas" : 1,
@@ -45,10 +45,10 @@
                 },
                 "network" : ["EIP150"],
                 "result" : {
-		    "3e180b1862f9d158abb5e519a6d8605540c23682" : {
-			"nonce" : "0"
-		     },
-		    "a000000000000000000000000000000000000000" : {
+                    "3e180b1862f9d158abb5e519a6d8605540c23682" : {
+                        "nonce" : "0"
+                     },
+                    "a000000000000000000000000000000000000000" : {
                         "storage" : {
                             "0x00" : "0x01",
                             "0x01" : "0x01",
@@ -64,7 +64,7 @@
                 }
             },
 	    {
-		"comment" : "NO OOG",
+                "//comment" : "NO OOG",
                 "indexes" : {
                     "data" : 1,
                     "gas" : 1,
@@ -72,9 +72,9 @@
                 },
                 "network" : ["Frontier", "Homestead"],
                 "result" : {
-		    "3e180b1862f9d158abb5e519a6d8605540c23682" : {
-		        "shouldnotexist" : "1"
-		    },
+                    "3e180b1862f9d158abb5e519a6d8605540c23682" : {
+                        "shouldnotexist" : "1"
+                    },
 		    "a000000000000000000000000000000000000000" : {
 		        "storage" : {
 		        }
@@ -86,7 +86,7 @@
                 }
             },
 	    {
-		"comment" : "OOG in subcall",
+                "//comment" : "OOG in subcall",
                 "indexes" : {
                     "data" : 0,
                     "gas" : 1,
@@ -94,10 +94,10 @@
                 },
                 "network" : ["ALL"],
                 "result" : {
-		    "3e180b1862f9d158abb5e519a6d8605540c23682" : {
-			"shouldnotexist" : "1"
-		    },
-		    "a000000000000000000000000000000000000000" : {
+                    "3e180b1862f9d158abb5e519a6d8605540c23682" : {
+                        "shouldnotexist" : "1"
+                    },
+                    "a000000000000000000000000000000000000000" : {
                         "storage" : {
                             "0x00" : "0x01",
                             "0x04" : "0x0c"
@@ -110,7 +110,7 @@
                 }
             },
 	    {
-		"comment" : "OOG after subcall / double OOG",
+                "//comment" : "OOG after subcall / double OOG",
                 "indexes" : {
                     "data" : [1, 0],
                     "gas" : 0,
diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCallsFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCallsFiller.json
index 2fa1c198b..c741ddf4f 100644
--- a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCallsFiller.json
+++ b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCallsFiller.json
@@ -78,7 +78,7 @@
                 }
             },
 	    {
-		"comment" : "OOG",
+                "//comment" : "OOG",
                 "indexes" : {
                     "data" : 0,
                     "gas" : 1,
diff --git a/src/GeneralStateTestsFiller/stSolidityTest/AmbiguousMethodFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/AmbiguousMethodFiller.json
index 489d6eb74..a5725a976 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/AmbiguousMethodFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/AmbiguousMethodFiller.json
@@ -28,23 +28,23 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//comment1" : "contract contract1",
-		"//comment2" : "{",
-		"//comment3" : "    uint value;",
-		"//comment4" : "    function run()",
-		"//comment5" : "    {",
-		"//comment6" : "        value = 225;",
-		"//comment7" : "    }",
-		"//comment8" : "}",
-		"//comment9" : "",
-		"//comment10" : "contract contract2",
-		"//comment11" : "{",
-		"//comment12" : "    uint value2;",
-		"//comment13" : "    function run()",
-		"//comment14" : "    {",
-		"//comment15" : "        value2 = 335;",
-		"//comment16" : "    }",
-		"//comment17" : "}",
+                "//comment1" : "contract contract1",
+                "//comment2" : "{",
+                "//comment3" : "    uint value;",
+                "//comment4" : "    function run()",
+                "//comment5" : "    {",
+                "//comment6" : "        value = 225;",
+                "//comment7" : "    }",
+                "//comment8" : "}",
+                "//comment9" : "",
+                "//comment10" : "contract contract2",
+                "//comment11" : "{",
+                "//comment12" : "    uint value2;",
+                "//comment13" : "    function run()",
+                "//comment14" : "    {",
+                "//comment15" : "        value2 = 335;",
+                "//comment16" : "    }",
+                "//comment17" : "}",
                 "code" : "0x60003560e060020a90048063c040622614601557005b601b6021565b60006000f35b61014f60008190555056",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSolidityTest/CallInfiniteLoopFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/CallInfiniteLoopFiller.json
index a200b099c..4d5c219d9 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/CallInfiniteLoopFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/CallInfiniteLoopFiller.json
@@ -26,23 +26,23 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//comment1" : "contract recursiveMethods",
-		"//comment2" : "{",
-		"//comment3" : "    function testInfiniteLoop()",
-		"//comment4" : "    {",
-		"//comment5" : "        while(true){}",
-		"//comment6" : "    }",
-		"//comment7" : "    ",
-		"//comment8" : "    function testRecursiveMethods()",
-		"//comment9" : "    {",
-		"//comment10" : "        testRecursiveMethods2();",
-		"//comment11" : "    }",
-		"//comment12" : "    ",
-		"//comment13" : "    function testRecursiveMethods2()",
-		"//comment14" : "    {",
-		"//comment15" : "        testRecursiveMethods();",
-		"//comment16" : "    }",
-		"//comment17" : "}",
+                "//comment1" : "contract recursiveMethods",
+                "//comment2" : "{",
+                "//comment3" : "    function testInfiniteLoop()",
+                "//comment4" : "    {",
+                "//comment5" : "        while(true){}",
+                "//comment6" : "    }",
+                "//comment7" : "    ",
+                "//comment8" : "    function testRecursiveMethods()",
+                "//comment9" : "    {",
+                "//comment10" : "        testRecursiveMethods2();",
+                "//comment11" : "    }",
+                "//comment12" : "    ",
+                "//comment13" : "    function testRecursiveMethods2()",
+                "//comment14" : "    {",
+                "//comment15" : "        testRecursiveMethods();",
+                "//comment16" : "    }",
+                "//comment17" : "}",
                 "code" : "0x60003560e060020a90048063296df0df1460295780634893d88a146035578063981a316514604157005b602f604d565b60006000f35b603b6062565b60006000f35b6047605a565b60006000f35b5b600115605857604e565b565b60606062565b565b6068605a565b56",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSolidityTest/CallLowLevelCreatesSolidityFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/CallLowLevelCreatesSolidityFiller.json
index 969d0b243..daef56e6f 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/CallLowLevelCreatesSolidityFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/CallLowLevelCreatesSolidityFiller.json
@@ -30,32 +30,32 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//comment1": "contract subcaller",
-		"//comment2": "{",
-		"//comment3": "  function init(address a)",
-		"//comment4": "  {",
-		"//comment5": "    main(a).setdata(225);",
-		"//comment6": "  }",
-		"//comment7": "}",
-		"//comment8": "",
-		"//comment9": "contract main",
-		"//comment10": "{",
-		"//comment11": "   uint data;",
-		"//comment12": "   address msgsender;",
-		"//comment13": "   function run() returns (uint)",
-		"//comment14": "   {",
-		"//comment15": "       data = 1;",
-		"//comment16": "      msgsender = 0x095e7baea6a6c7c4c2dfeb977efac326af552d87;",
-		"//comment17": "       subcaller a = new subcaller();",
-		"//comment18": "       a.init(msgsender);",
-		"//comment19": "       return data;",
-		"//comment20": "   }",
-		"//comment21": "   ",
-		"//comment22": "   function setdata(uint _data)",
-		"//comment23": "   {",
-		"//comment24": "       data = _data;",
-		"//comment25": "   }",
-		"//comment26": "}",
+                "//comment1": "contract subcaller",
+                "//comment2": "{",
+                "//comment3": "  function init(address a)",
+                "//comment4": "  {",
+                "//comment5": "    main(a).setdata(225);",
+                "//comment6": "  }",
+                "//comment7": "}",
+                "//comment8": "",
+                "//comment9": "contract main",
+                "//comment10": "{",
+                "//comment11": "   uint data;",
+                "//comment12": "   address msgsender;",
+                "//comment13": "   function run() returns (uint)",
+                "//comment14": "   {",
+                "//comment15": "       data = 1;",
+                "//comment16": "      msgsender = 0x095e7baea6a6c7c4c2dfeb977efac326af552d87;",
+                "//comment17": "       subcaller a = new subcaller();",
+                "//comment18": "       a.init(msgsender);",
+                "//comment19": "       return data;",
+                "//comment20": "   }",
+                "//comment21": "   ",
+                "//comment22": "   function setdata(uint _data)",
+                "//comment23": "   {",
+                "//comment24": "       data = _data;",
+                "//comment25": "   }",
+                "//comment26": "}",
                 "code" : "0x60003560e060020a9004806330debb4214610021578063c04062261461003257005b61002c6004356100c7565b60006000f35b61003a610044565b8060005260206000f35b60006000600160008190555073095e7baea6a6c7c4c2dfeb977efac326af552d87600181905550606a6100d2600039606a60006000f0905080600160a060020a03166319ab453c600060008260e060020a026000526004600154600160a060020a03168152602001600060008660325a03f16100bc57005b505060005491505090565b80600081905550505600605e80600c6000396000f30060003560e060020a9004806319ab453c14601557005b601e6004356024565b60006000f35b80600160a060020a03166330debb42600060008260e060020a02600052600460e18152602001600060008660325a03f1605957005b50505056",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSolidityTest/CallRecursiveMethodsFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/CallRecursiveMethodsFiller.json
index fd6b2ca62..bfa7bdbac 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/CallRecursiveMethodsFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/CallRecursiveMethodsFiller.json
@@ -26,23 +26,23 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//comment1" : "contract recursiveMethods",
-		"//comment2" : "{",
-		"//comment3" : "    function testInfiniteLoop()",
-		"//comment4" : "    {",
-		"//comment5" : "        while(true){}",
-		"//comment6" : "    }",
-		"//comment7" : "    ",
-		"//comment8" : "    function testRecursiveMethods()",
-		"//comment9" : "    {",
-		"//comment10" : "        testRecursiveMethods2();",
-		"//comment11" : "    }",
-		"//comment12" : "    ",
-		"//comment13" : "    function testRecursiveMethods2()",
-		"//comment14" : "    {",
-		"//comment15" : "        testRecursiveMethods();",
-		"//comment16" : "    }",
-		"//comment17" : "}",
+                "//comment1" : "contract recursiveMethods",
+                "//comment2" : "{",
+                "//comment3" : "    function testInfiniteLoop()",
+                "//comment4" : "    {",
+                "//comment5" : "        while(true){}",
+                "//comment6" : "    }",
+                "//comment7" : "    ",
+                "//comment8" : "    function testRecursiveMethods()",
+                "//comment9" : "    {",
+                "//comment10" : "        testRecursiveMethods2();",
+                "//comment11" : "    }",
+                "//comment12" : "    ",
+                "//comment13" : "    function testRecursiveMethods2()",
+                "//comment14" : "    {",
+                "//comment15" : "        testRecursiveMethods();",
+                "//comment16" : "    }",
+                "//comment17" : "}",
                 "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463296df0df811460415780634893d88a14604d578063981a316514605957005b60476065565b60006000f35b6053607a565b60006000f35b605f6072565b60006000f35b5b6001156070576066565b565b6078607a565b565b60806072565b56",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSolidityTest/ContractInheritanceFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/ContractInheritanceFiller.json
index 4dae11ce5..a08f4df95 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/ContractInheritanceFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/ContractInheritanceFiller.json
@@ -28,43 +28,43 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//comment1" : "contract base",
-		"//comment2" : "{",
-		"//comment3" : "    function methodA() returns (uint32)",
-		"//comment4" : "    {",
-		"//comment5" : "        return 1;",
-		"//comment6" : "    }",
-		"//comment7" : "}",
-		"//comment8" : "",
-		"//comment9" : "contract frombase is base",
-		"//comment10" : "{",
-		"//comment11" : "    function methodA() returns (uint32)",
-		"//comment12" : "    {",
-		"//comment13" : "        return 2;",
-		"//comment14" : "    }",
-		"//comment15" : "}",
-		"//comment16" : "",
-		"//comment17" : "contract main",
-		"//comment18" : "{",
-		"//comment19" : "    bool returnValue;",
-		"//comment20" : "    function run() returns (bool)",
-		"//comment21" : "    {",
-		"//comment22" : "       returnValue = testInheretance();",
-		"//comment23" : "       return returnValue;",
-		"//comment24" : "    }",
-		"//comment25" : "   ",
-		"//comment26" : "    function testInheretance() returns (bool res)",
-		"//comment27" : "    {",
-		"//comment28" : "        res = true;",
-		"//comment29" : "        base contract1 = new base();",
-		"//comment30" : "        if (contract1.methodA() != 1)",
-		"//comment31" : "            return false;",
-		"//comment32" : "",
-		"//comment33" : "        frombase contract2 = new frombase();",
-		"//comment34" : "        if (contract2.methodA() != 2)",
-		"//comment35" : "            return false;",
-		"//comment36" : "    }",
-		"//comment37" : "}",
+                "//comment1" : "contract base",
+                "//comment2" : "{",
+                "//comment3" : "    function methodA() returns (uint32)",
+                "//comment4" : "    {",
+                "//comment5" : "        return 1;",
+                "//comment6" : "    }",
+                "//comment7" : "}",
+                "//comment8" : "",
+                "//comment9" : "contract frombase is base",
+                "//comment10" : "{",
+                "//comment11" : "    function methodA() returns (uint32)",
+                "//comment12" : "    {",
+                "//comment13" : "        return 2;",
+                "//comment14" : "    }",
+                "//comment15" : "}",
+                "//comment16" : "",
+                "//comment17" : "contract main",
+                "//comment18" : "{",
+                "//comment19" : "    bool returnValue;",
+                "//comment20" : "    function run() returns (bool)",
+                "//comment21" : "    {",
+                "//comment22" : "       returnValue = testInheretance();",
+                "//comment23" : "       return returnValue;",
+                "//comment24" : "    }",
+                "//comment25" : "   ",
+                "//comment26" : "    function testInheretance() returns (bool res)",
+                "//comment27" : "    {",
+                "//comment28" : "        res = true;",
+                "//comment29" : "        base contract1 = new base();",
+                "//comment30" : "        if (contract1.methodA() != 1)",
+                "//comment31" : "            return false;",
+                "//comment32" : "",
+                "//comment33" : "        frombase contract2 = new frombase();",
+                "//comment34" : "        if (contract2.methodA() != 2)",
+                "//comment35" : "            return false;",
+                "//comment36" : "    }",
+                "//comment37" : "}",
                 "code" : "0x7c010000000000000000000000000000000000000000000000000000000060003504633e0bca3b8114610039578063c0406226146100a857005b6100b55b600160008060456101ec8339604560006000f091508173ffffffffffffffffffffffffffffffffffffffff166381bda09b60206000827c010000000000000000000000000000000000000000000000000000000002600052600460006000866161da5a03f161011957005b6100bf60006100c961003d565b8060005260206000f35b8060005260206000f35b600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0016919091179081905560ff16919050565b505060005163ffffffff166002141561019d575b5b505090565b505060005163ffffffff1660011415610194575b60456101a7600039604560006000f090508073ffffffffffffffffffffffffffffffffffffffff166381bda09b60206000827c010000000000000000000000000000000000000000000000000000000002600052600460006000866161da5a03f16100ff57005b60009250610114565b600092506101145600603980600c6000396000f3007c0100000000000000000000000000000000000000000000000000000000600035046381bda09b8114602d57005b60026000818152602090f3603980600c6000396000f3007c0100000000000000000000000000000000000000000000000000000000600035046381bda09b8114602d57005b60016000818152602090f3",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSolidityTest/CreateContractFromMethodFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/CreateContractFromMethodFiller.json
index b9825847c..d2a3580ad 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/CreateContractFromMethodFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/CreateContractFromMethodFiller.json
@@ -73,31 +73,31 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//comment1": "contract TestContract",
-		"//comment2": "{",
-		"//comment3": "    function testMethod() returns (int res)",
-		"//comment4": "    {",
-		"//comment5": "        return 225;",
-    "//comment6": "    }",
-		"//comment7": "",
-		"//comment8": "    function destroy(address sendFoundsTo)",
-		"//comment9": "    {",
-		"//comment10": "        suicide(sendFoundsTo);",
-		"//comment11": "    }",
-		"//comment12": "}",
-		"//comment13": "",
-		"//comment14": "contract main",
-		"//comment15": "{",
-		"//comment16": "   function run() returns (uint)",
-		"//comment17": "   {",
-		"//comment18": "       createContractFromMethod();",
-		"//comment19": "   }",
-		"//comment20": "   ",
-		"//comment21": "   function createContractFromMethod() returns (TestContract a)",
-		"//comment22": "   {",
-		"//comment23": "       a = new TestContract();",
-		"//comment24": "   }",
-		"//comment25": "}",
+                "//comment1": "contract TestContract",
+                "//comment2": "{",
+                "//comment3": "    function testMethod() returns (int res)",
+                "//comment4": "    {",
+                "//comment5": "        return 225;",
+                "//comment6": "    }",
+                "//comment7": "",
+                "//comment8": "    function destroy(address sendFoundsTo)",
+                "//comment9": "    {",
+                "//comment10": "        suicide(sendFoundsTo);",
+                "//comment11": "    }",
+                "//comment12": "}",
+                "//comment13": "",
+                "//comment14": "contract main",
+                "//comment15": "{",
+                "//comment16": "   function run() returns (uint)",
+                "//comment17": "   {",
+                "//comment18": "       createContractFromMethod();",
+                "//comment19": "   }",
+                "//comment20": "   ",
+                "//comment21": "   function createContractFromMethod() returns (TestContract a)",
+                "//comment22": "   {",
+                "//comment23": "       a = new TestContract();",
+                "//comment24": "   }",
+                "//comment25": "}",
                 "code" : "0x60003560e060020a900480637ee17e1214601f578063c040622614602b57005b60256047565b60006000f35b6031603b565b8060005260206000f35b600060436047565b5090565b60006060605d600039606060006000f09050905600605480600c6000396000f30060003560e060020a90048062f55d9d14601e578063b9c3d0a514602d57005b60276004356046565b60006000f35b6033603d565b8060005260206000f35b600060e1905090565b80600160a060020a0316ff5056",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsCreate4ContractsFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsCreate4ContractsFiller.json
index 47cc179fb..3daad5e81 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsCreate4ContractsFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsCreate4ContractsFiller.json
@@ -94,47 +94,47 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000000000000000000",
-		"//comment1" : "contract recursiveCreate1",
-		"//comment2" : "{",
-		"//comment3" : "    uint depp;",
-		"//comment4" : "    function recursiveCreate1(address a, uint depth)",
-		"//comment5" : "    {",
-		"//comment6" : "        depth = depth - 1;",
-		"//comment7" : "depp = depth;",
-		"//comment8" : "        if(depth > 0)",
-		"//comment9" : "            main(a).create2(depth);",
-		"//comment10" : "    }",
-		"//comment11" : "}",
-		"//comment12" : "",
-		"//comment13" : "contract recursiveCreate2",
-		"//comment14" : "{",
-		"//comment15" : "    uint depp;",
-		"//comment16" : "    function recursiveCreate2(address a, uint depth)",
-		"//comment17" : "    {",
-		"//comment18" : "        depth = depth - 1;",
-		"//comment19" : "depp = depth;",
-		"//comment20" : "        if(depth > 0)",
-		"//comment21" : "            recursiveCreate1 rec1 = new recursiveCreate1(a, depth);",
-		"//comment22" : "    }",
-		"//comment23" : "}",
-		"//comment24" : "",
-		"//comment25" : "contract main",
-		"//comment26" : "{",
-		"//comment27" : "    address maincontract;",
-		"//comment28" : "    uint depp;",
-		"//comment29" : "    function run(uint depth)",
-		"//comment30" : "    {",
-		"//comment31" : "        maincontract = 0x095e7baea6a6c7c4c2dfeb977efac326af552d87;",
-		"//comment32" : "        depp = depth;",
-		"//comment33" : "        recursiveCreate1 rec1 = new recursiveCreate1(maincontract, depth);",
-		"//comment34" : "    }",
-		"//comment35" : "",
-		"//comment36" : "    function create2(uint depth)",
-		"//comment37" : "    {",
-		"//comment38" : "        recursiveCreate2 rec2 = new recursiveCreate2(maincontract, depth);",
-		"//comment39" : "        address(rec2).send(2);",
-		"//comment40" : "    }",
-		"//comment41" : "}",
+                "//comment1" : "contract recursiveCreate1",
+                "//comment2" : "{",
+                "//comment3" : "    uint depp;",
+                "//comment4" : "    function recursiveCreate1(address a, uint depth)",
+                "//comment5" : "    {",
+                "//comment6" : "        depth = depth - 1;",
+                "//comment7" : "depp = depth;",
+                "//comment8" : "        if(depth > 0)",
+                "//comment9" : "            main(a).create2(depth);",
+                "//comment10" : "    }",
+                "//comment11" : "}",
+                "//comment12" : "",
+                "//comment13" : "contract recursiveCreate2",
+                "//comment14" : "{",
+                "//comment15" : "    uint depp;",
+                "//comment16" : "    function recursiveCreate2(address a, uint depth)",
+                "//comment17" : "    {",
+                "//comment18" : "        depth = depth - 1;",
+                "//comment19" : "depp = depth;",
+                "//comment20" : "        if(depth > 0)",
+                "//comment21" : "            recursiveCreate1 rec1 = new recursiveCreate1(a, depth);",
+                "//comment22" : "    }",
+                "//comment23" : "}",
+                "//comment24" : "",
+                "//comment25" : "contract main",
+                "//comment26" : "{",
+                "//comment27" : "    address maincontract;",
+                "//comment28" : "    uint depp;",
+                "//comment29" : "    function run(uint depth)",
+                "//comment30" : "    {",
+                "//comment31" : "        maincontract = 0x095e7baea6a6c7c4c2dfeb977efac326af552d87;",
+                "//comment32" : "        depp = depth;",
+                "//comment33" : "        recursiveCreate1 rec1 = new recursiveCreate1(maincontract, depth);",
+                "//comment34" : "    }",
+                "//comment35" : "",
+                "//comment36" : "    function create2(uint depth)",
+                "//comment37" : "    {",
+                "//comment38" : "        recursiveCreate2 rec2 = new recursiveCreate2(maincontract, depth);",
+                "//comment39" : "        address(rec2).send(2);",
+                "//comment40" : "    }",
+                "//comment41" : "}",
                 "code" : "0x60003560e060020a90048063820b13f614610021578063a444f5e91461003257005b61002c600435610093565b60006000f35b61003d600435610043565b60006000f35b600073095e7baea6a6c7c4c2dfeb977efac326af552d8760008190555081600181905550606b6101ad600039606b600054600160a060020a0316815260200182815260200160006000f090505050565b600060c86100e560003960c8600054600160a060020a0316815260200182815260200160006000f0905080600160a060020a0316600060026000600060006000848787f16100dd57005b50505050505600604060c860043960045160245160006001820391508160008190555060008211602657604c565b606b605d600039606b83600160a060020a0316815260200182815260200160006000f090505b505050600180605c6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f30000",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsFiller.json
index d253ff969..2ca3857a2 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsFiller.json
@@ -86,47 +86,47 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000000000000000000",
-		"//comment1" : "contract recursiveCreate1",
-		"//comment2" : "{",
-		"//comment3" : "    uint depp;",
-		"//comment4" : "    function recursiveCreate1(address a, uint depth)",
-		"//comment5" : "    {",
-		"//comment6" : "        depth = depth - 1;",
-		"//comment7" : "depp = depth;",
-		"//comment8" : "        if(depth > 0)",
-		"//comment9" : "            main(a).create2(depth);",
-		"//comment10" : "    }",
-		"//comment11" : "}",
-		"//comment12" : "",
-		"//comment13" : "contract recursiveCreate2",
-		"//comment14" : "{",
-		"//comment15" : "    uint depp;",
-		"//comment16" : "    function recursiveCreate2(address a, uint depth)",
-		"//comment17" : "    {",
-		"//comment18" : "        depth = depth - 1;",
-		"//comment19" : "depp = depth;",
-		"//comment20" : "        if(depth > 0)",
-		"//comment21" : "            recursiveCreate1 rec1 = new recursiveCreate1(a, depth);",
-		"//comment22" : "    }",
-		"//comment23" : "}",
-		"//comment24" : "",
-		"//comment25" : "contract main",
-		"//comment26" : "{",
-		"//comment27" : "    address maincontract;",
-		"//comment28" : "    uint depp;",
-		"//comment29" : "    function run(uint depth)",
-		"//comment30" : "    {",
-		"//comment31" : "        maincontract = 0x095e7baea6a6c7c4c2dfeb977efac326af552d87;",
-		"//comment32" : "        depp = depth;",
-		"//comment33" : "        recursiveCreate1 rec1 = new recursiveCreate1(maincontract, depth);",
-		"//comment34" : "    }",
-		"//comment35" : "",
-		"//comment36" : "    function create2(uint depth)",
-		"//comment37" : "    {",
-		"//comment38" : "        recursiveCreate2 rec2 = new recursiveCreate2(maincontract, depth);",
-		"//comment39" : "        address(rec2).send(2);",
-		"//comment40" : "    }",
-		"//comment41" : "}",
+                "//comment1" : "contract recursiveCreate1",
+                "//comment2" : "{",
+                "//comment3" : "    uint depp;",
+                "//comment4" : "    function recursiveCreate1(address a, uint depth)",
+                "//comment5" : "    {",
+                "//comment6" : "        depth = depth - 1;",
+                "//comment7" : "depp = depth;",
+                "//comment8" : "        if(depth > 0)",
+                "//comment9" : "            main(a).create2(depth);",
+                "//comment10" : "    }",
+                "//comment11" : "}",
+                "//comment12" : "",
+                "//comment13" : "contract recursiveCreate2",
+                "//comment14" : "{",
+                "//comment15" : "    uint depp;",
+                "//comment16" : "    function recursiveCreate2(address a, uint depth)",
+                "//comment17" : "    {",
+                "//comment18" : "        depth = depth - 1;",
+                "//comment19" : "depp = depth;",
+                "//comment20" : "        if(depth > 0)",
+                "//comment21" : "            recursiveCreate1 rec1 = new recursiveCreate1(a, depth);",
+                "//comment22" : "    }",
+                "//comment23" : "}",
+                "//comment24" : "",
+                "//comment25" : "contract main",
+                "//comment26" : "{",
+                "//comment27" : "    address maincontract;",
+                "//comment28" : "    uint depp;",
+                "//comment29" : "    function run(uint depth)",
+                "//comment30" : "    {",
+                "//comment31" : "        maincontract = 0x095e7baea6a6c7c4c2dfeb977efac326af552d87;",
+                "//comment32" : "        depp = depth;",
+                "//comment33" : "        recursiveCreate1 rec1 = new recursiveCreate1(maincontract, depth);",
+                "//comment34" : "    }",
+                "//comment35" : "",
+                "//comment36" : "    function create2(uint depth)",
+                "//comment37" : "    {",
+                "//comment38" : "        recursiveCreate2 rec2 = new recursiveCreate2(maincontract, depth);",
+                "//comment39" : "        address(rec2).send(2);",
+                "//comment40" : "    }",
+                "//comment41" : "}",
                 "code" : "0x60003560e060020a90048063820b13f614610021578063a444f5e91461003257005b61002c600435610093565b60006000f35b61003d600435610043565b60006000f35b600073095e7baea6a6c7c4c2dfeb977efac326af552d8760008190555081600181905550606b6101ad600039606b600054600160a060020a0316815260200182815260200160006000f090505050565b600060c86100e560003960c8600054600160a060020a0316815260200182815260200160006000f0905080600160a060020a0316600060026000600060006000848787f16100dd57005b50505050505600604060c860043960045160245160006001820391508160008190555060008211602657604c565b606b605d600039606b83600160a060020a0316815260200182815260200160006000f090505b505050600180605c6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f30000",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSolidityTest/TestBlockAndTransactionPropertiesFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/TestBlockAndTransactionPropertiesFiller.json
index 66fe584ca..7c4d51b28 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/TestBlockAndTransactionPropertiesFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/TestBlockAndTransactionPropertiesFiller.json
@@ -28,49 +28,49 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//comment1" : "contract main",
-		"//comment2" : "{",
-		"//comment3" : "    bool returnValue;",
-		"//comment4" : "    function run() returns (bool)",
-		"//comment5" : "    {",
-		"//comment6" : "       returnValue = testBlockAndTransactionProperties();",
-		"//comment7" : "       return returnValue;",
-		"//comment8" : "    }",
-		"//comment9" : "",
-		"//comment10" : "    function testBlockAndTransactionProperties() returns (bool res)",
-		"//comment11" : "    {",
-		"//comment12" : "        res = true;",
-		"//comment13" : "        if (block.coinbase != 0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba)",
-		"//comment14" : "            return false;",
-		"//comment15" : "",
-		"//comment16" : "        if (block.difficulty != 45678256)",
-		"//comment17" : "            return false;",
-		"//comment18" : "",
-		"//comment19" : "        if (block.gaslimit != 0x7fffffffffffffff)",
-		"//comment20" : "            return false;",
-		"//comment21" : "",
-		"//comment22" : "        if (block.number != 120)",
-		"//comment23" : "            return false;",
-		"//comment24" : "",
-		"//comment25" : "        //try to call this",
-		"//comment26" : "        block.blockhash(120);",
-		"//comment27" : "        block.timestamp;",
-		"//comment28" : "        msg.gas;",
-		"//comment29" : "",
-		"//comment30" : "        if (msg.sender != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)",
-		"//comment31" : "            return false;",
-		"//comment32" : "",
-		"//comment33" : "        if (msg.value != 100)",
-		"//comment34" : "            return false;",
-		"//comment35" : "",
-		"//comment36" : "        if (tx.gasprice != 1)",
-		"//comment37" : "            return false;",
-		"//comment38" : "",
-		"//comment39" : "        if (tx.origin != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)",
-		"//comment40" : "            return false;",
-		"//comment41" : "",
-		"//comment42" : "    }",
-		"//comment43" : "}",
+                "//comment1" : "contract main",
+                "//comment2" : "{",
+                "//comment3" : "    bool returnValue;",
+                "//comment4" : "    function run() returns (bool)",
+                "//comment5" : "    {",
+                "//comment6" : "       returnValue = testBlockAndTransactionProperties();",
+                "//comment7" : "       return returnValue;",
+                "//comment8" : "    }",
+                "//comment9" : "",
+                "//comment10" : "    function testBlockAndTransactionProperties() returns (bool res)",
+                "//comment11" : "    {",
+                "//comment12" : "        res = true;",
+                "//comment13" : "        if (block.coinbase != 0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba)",
+                "//comment14" : "            return false;",
+                "//comment15" : "",
+                "//comment16" : "        if (block.difficulty != 45678256)",
+                "//comment17" : "            return false;",
+                "//comment18" : "",
+                "//comment19" : "        if (block.gaslimit != 0x7fffffffffffffff)",
+                "//comment20" : "            return false;",
+                "//comment21" : "",
+                "//comment22" : "        if (block.number != 120)",
+                "//comment23" : "            return false;",
+                "//comment24" : "",
+                "//comment25" : "        //try to call this",
+                "//comment26" : "        block.blockhash(120);",
+                "//comment27" : "        block.timestamp;",
+                "//comment28" : "        msg.gas;",
+                "//comment29" : "",
+                "//comment30" : "        if (msg.sender != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)",
+                "//comment31" : "            return false;",
+                "//comment32" : "",
+                "//comment33" : "        if (msg.value != 100)",
+                "//comment34" : "            return false;",
+                "//comment35" : "",
+                "//comment36" : "        if (tx.gasprice != 1)",
+                "//comment37" : "            return false;",
+                "//comment38" : "",
+                "//comment39" : "        if (tx.origin != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)",
+                "//comment40" : "            return false;",
+                "//comment41" : "",
+                "//comment42" : "    }",
+                "//comment43" : "}",
                 "code" : "0x60606040526000357c010000000000000000000000000000000000000000000000000000000090048063c040622614610044578063e97384dc1461006957610042565b005b610051600480505061008e565b60405180821515815260200191505060405180910390f35b61007660048050506100c9565b60405180821515815260200191505060405180910390f35b60006100986100c9565b600060006101000a81548160ff02191690830217905550600060009054906101000a900460ff1690506100c6565b90565b6000600190508050732adc25665018aa1fe0e6bc666dac8fc2697ff9ba4173ffffffffffffffffffffffffffffffffffffffff1614151561010d57600090506101f7565b6302b8feb04414151561012357600090506101f7565b677fffffffffffffff4514151561013d57600090506101f7565b60784314151561015057600090506101f7565b6078405042505a5073a94f5374fce5edbc8e2a8697c15331677e6ebf0b3373ffffffffffffffffffffffffffffffffffffffff1614151561019457600090506101f7565b6064341415156101a757600090506101f7565b60013a1415156101ba57600090506101f7565b73a94f5374fce5edbc8e2a8697c15331677e6ebf0b3273ffffffffffffffffffffffffffffffffffffffff161415156101f657600090506101f7565b5b9056",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSolidityTest/TestContractInteractionFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/TestContractInteractionFiller.json
index b66bbeeb2..7b540ea53 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/TestContractInteractionFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/TestContractInteractionFiller.json
@@ -29,35 +29,35 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//comment1": "contract TestContract",
-		"//comment2": "{",
-		"//comment3": "    function testMethod() returns (int res)",
-		"//comment4": "    {",
-		"//comment5": "        return 225;",
-		"//comment6": "    }",
-		"//comment7": "",
-		"//comment8": "    function destroy(address sendFoundsTo)",
-		"//comment9": "    {",
-		"//comment10": "        suicide(sendFoundsTo);",
-		"//comment11": "    }",
-		"//comment12": "}",
-		"//comment13": "contract main",
-		"//comment14": "{",
-		"//comment15": "    bool returnValue;",
-		"//comment16": "    function run() returns (bool)",
-		"//comment17": "    {",
-		"//comment18": "       returnValue = testContractInteraction();",
-		"//comment19": "       return returnValue;",
-		"//comment20": "    }",
-		"//comment21": "",
-		"//comment22" : "    function testContractInteraction() returns (bool res)",
-		"//comment23" : "    {",
-		"//comment24" : "        TestContract a = new TestContract();",
-		"//comment25" : "        if (a.testMethod() == 225)",
-		"//comment26" : "            return true;",
-		"//comment27" : "        return false;",
-		"//comment28" : "    }",
-		"//comment29": "}",
+                "//comment1": "contract TestContract",
+                "//comment2": "{",
+                "//comment3": "    function testMethod() returns (int res)",
+                "//comment4": "    {",
+                "//comment5": "        return 225;",
+                "//comment6": "    }",
+                "//comment7": "",
+                "//comment8": "    function destroy(address sendFoundsTo)",
+                "//comment9": "    {",
+                "//comment10": "        suicide(sendFoundsTo);",
+                "//comment11": "    }",
+                "//comment12": "}",
+                "//comment13": "contract main",
+                "//comment14": "{",
+                "//comment15": "    bool returnValue;",
+                "//comment16": "    function run() returns (bool)",
+                "//comment17": "    {",
+                "//comment18": "       returnValue = testContractInteraction();",
+                "//comment19": "       return returnValue;",
+                "//comment20": "    }",
+                "//comment21": "",
+                "//comment22" : "    function testContractInteraction() returns (bool res)",
+                "//comment23" : "    {",
+                "//comment24" : "        TestContract a = new TestContract();",
+                "//comment25" : "        if (a.testMethod() == 225)",
+                "//comment26" : "            return true;",
+                "//comment27" : "        return false;",
+                "//comment28" : "    }",
+                "//comment29": "}",
                 "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463c04062268114610039578063ed973fe91461004b57005b6100416100ea565b8060005260206000f35b61005361005d565b8060005260206000f35b60006000608161011a600039608160006000f0905073ffffffffffffffffffffffffffffffffffffffff811663b9c3d0a5602060007fb9c3d0a50000000000000000000000000000000000000000000000000000000081526004600060008660325a03f16100c757005b505060005160e1146100d8576100e1565b600191506100e6565b600091505b5090565b60006100f461005d565b600060006101000a81548160ff0219169083021790555060ff600160005404169050905600607580600c6000396000f3007c01000000000000000000000000000000000000000000000000000000006000350462f55d9d81146036578063b9c3d0a514604557005b603f6004356055565b60006000f35b604b6070565b8060005260206000f35b8073ffffffffffffffffffffffffffffffffffffffff16ff50565b60e19056",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSolidityTest/TestContractSuicideFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/TestContractSuicideFiller.json
index c4cf495a8..5c37c33fd 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/TestContractSuicideFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/TestContractSuicideFiller.json
@@ -29,36 +29,36 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//comment1": "contract TestContract",
-		"//comment2": "{",
-		"//comment3": "    function testMethod() returns (int res)",
-		"//comment4": "    {",
-		"//comment5": "        return 225;",
-		"//comment6": "    }",
-		"//comment7": "",
-		"//comment8": "    function destroy(address sendFoundsTo)",
-		"//comment9": "    {",
-		"//comment10": "        suicide(sendFoundsTo);",
-		"//comment11": "    }",
-		"//comment12": "}",
-		"//comment13": "contract main",
-		"//comment14": "{",
-		"//comment15": "   bool returnValue;",
-		"//comment16": "    function run() returns (bool)",
-		"//comment17": "    {",
-		"//comment18": "       returnValue = testContractSuicide();",
-		"//comment19": "       return returnValue;",
-		"//comment20": "    }",
-		"//comment21": "",
-		"//comment22": "    function testContractSuicide() returns (bool res)",
-		"//comment23": "    {",
-		"//comment24": "        TestContract a = new TestContract();",
-		"//comment25": "        a.destroy(block.coinbase);",
-		"//comment26": "        if (a.testMethod() == 225) //we should be able to call a contract",
-		"//comment27": "            return true;",
-		"//comment28": "        return false;",
-		"//comment29": "    }",
-		"//comment30": "}",
+                "//comment1": "contract TestContract",
+                "//comment2": "{",
+                "//comment3": "    function testMethod() returns (int res)",
+                "//comment4": "    {",
+                "//comment5": "        return 225;",
+                "//comment6": "    }",
+                "//comment7": "",
+                "//comment8": "    function destroy(address sendFoundsTo)",
+                "//comment9": "    {",
+                "//comment10": "        suicide(sendFoundsTo);",
+                "//comment11": "    }",
+                "//comment12": "}",
+                "//comment13": "contract main",
+                "//comment14": "{",
+                "//comment15": "   bool returnValue;",
+                "//comment16": "    function run() returns (bool)",
+                "//comment17": "    {",
+                "//comment18": "       returnValue = testContractSuicide();",
+                "//comment19": "       return returnValue;",
+                "//comment20": "    }",
+                "//comment21": "",
+                "//comment22": "    function testContractSuicide() returns (bool res)",
+                "//comment23": "    {",
+                "//comment24": "        TestContract a = new TestContract();",
+                "//comment25": "        a.destroy(block.coinbase);",
+                "//comment26": "        if (a.testMethod() == 225) //we should be able to call a contract",
+                "//comment27": "            return true;",
+                "//comment28": "        return false;",
+                "//comment29": "    }",
+                "//comment30": "}",
                 "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463a60eedda8114610039578063c04062261461004b57005b61004161005d565b8060005260206000f35b61005361015a565b8060005260206000f35b60006000608161018a600039608160006000f0905073ffffffffffffffffffffffffffffffffffffffff811662f55d9d6000807ef55d9d00000000000000000000000000000000000000000000000000000000825260044173ffffffffffffffffffffffffffffffffffffffff168152602001600060008660325a03f16100e057005b505073ffffffffffffffffffffffffffffffffffffffff811663b9c3d0a5602060007fb9c3d0a50000000000000000000000000000000000000000000000000000000081526004600060008660325a03f161013757005b505060005160e11461014857610151565b60019150610156565b600091505b5090565b600061016461005d565b600060006101000a81548160ff0219169083021790555060ff600160005404169050905600607580600c6000396000f3007c01000000000000000000000000000000000000000000000000000000006000350462f55d9d81146036578063b9c3d0a514604557005b603f600435605a565b60006000f35b604b6055565b8060005260206000f35b60e190565b8073ffffffffffffffffffffffffffffffffffffffff16ff5056",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSolidityTest/TestCryptographicFunctionsFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/TestCryptographicFunctionsFiller.json
index 1e557f2a8..75c7b8f5b 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/TestCryptographicFunctionsFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/TestCryptographicFunctionsFiller.json
@@ -28,34 +28,34 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//comment1" : "contract main",
-		"//comment2" : "{",
-		"//comment3" : "    bool returnValue;",
-		"//comment4" : "    function run() returns (bool)",
-		"//comment5" : "    {",
-		"//comment6" : "       returnValue = testCryptographicFunctions();",
-		"//comment7" : "       return returnValue;",
-		"//comment8" : "    }",
-		"//comment9" : "",
-		"//comment10" : "    function testCryptographicFunctions() returns (bool res)",
-		"//comment11" : "    {",
-		"//comment12" : "        res = true;",
-		"//comment13" : "        if (sha3('teststring') != 0x43c4b4524adb81e4e9a5c4648a98e9d320e3908ac5b6c889144b642cd08ae16d)",
-		"//comment14" : "            return false;",
-		"//comment15" : "",
-		"//comment16" : "        if (sha256('teststring') != 0x3c8727e019a42b444667a587b6001251becadabbb36bfed8087a92c18882d111)",
-		"//comment17" : "            return false;",
-		"//comment18" : "",
-		"//comment19" : "        if (ripemd160('teststring') != 0xcd566972b5e50104011a92b59fa8e0b1234851ae)",
-		"//comment20" : "            return false;",
-		"//comment21" : "",
-		"//comment22" : "if (ecrecover(0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c,",
-		"//comment23" : "                      28, 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f,",
-		"//comment24" : "                      0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549)",
-		"//comment25" : "                      != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)",
-		"//comment26" : "        return false;",
-		"//comment27" : "    }",
-		"//comment28" : "}",
+                "//comment1" : "contract main",
+                "//comment2" : "{",
+                "//comment3" : "    bool returnValue;",
+                "//comment4" : "    function run() returns (bool)",
+                "//comment5" : "    {",
+                "//comment6" : "       returnValue = testCryptographicFunctions();",
+                "//comment7" : "       return returnValue;",
+                "//comment8" : "    }",
+                "//comment9" : "",
+                "//comment10" : "    function testCryptographicFunctions() returns (bool res)",
+                "//comment11" : "    {",
+                "//comment12" : "        res = true;",
+                "//comment13" : "        if (sha3('teststring') != 0x43c4b4524adb81e4e9a5c4648a98e9d320e3908ac5b6c889144b642cd08ae16d)",
+                "//comment14" : "            return false;",
+                "//comment15" : "",
+                "//comment16" : "        if (sha256('teststring') != 0x3c8727e019a42b444667a587b6001251becadabbb36bfed8087a92c18882d111)",
+                "//comment17" : "            return false;",
+                "//comment18" : "",
+                "//comment19" : "        if (ripemd160('teststring') != 0xcd566972b5e50104011a92b59fa8e0b1234851ae)",
+                "//comment20" : "            return false;",
+                "//comment21" : "",
+                "//comment22" : "if (ecrecover(0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c,",
+                "//comment23" : "                      28, 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f,",
+                "//comment24" : "                      0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549)",
+                "//comment25" : "                      != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)",
+                "//comment26" : "        return false;",
+                "//comment27" : "    }",
+                "//comment28" : "}",
                 "code" : "0x6000357c010000000000000000000000000000000000000000000000000000000090048063c04062261461003a578063e0a9fd281461004c57005b61004261005e565b8060005260206000f35b610054610099565b8060005260206000f35b6000610068610099565b600060006101000a81548160ff02191690830217905550600060009054906101000a900460ff169050610096565b90565b60006001905080507f43c4b4524adb81e4e9a5c4648a98e9d320e3908ac5b6c889144b642cd08ae16d60010260407f74657374737472696e67000000000000000000000000000000000000000000008152600a016040900360402014156100ff57610108565b600090506102ec565b7f3c8727e019a42b444667a587b6001251becadabbb36bfed8087a92c18882d11160010260026020600060007f74657374737472696e67000000000000000000000000000000000000000000008152600a0160006000856161da5a03f161016b57005b50600051141561017a57610183565b600090506102ec565b73cd566972b5e50104011a92b59fa8e0b1234851ae6c010000000000000000000000000260036020600060007f74657374737472696e67000000000000000000000000000000000000000000008152600a0160006000856161da5a03f16101e657005b506000516c010000000000000000000000000214156102045761020d565b600090506102ec565b73a94f5374fce5edbc8e2a8697c15331677e6ebf0b60016020600060007f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c6001028152602001601c81526020017f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f60010281526020017feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549600102815260200160006000856161da5a03f16102bd57005b5060005173ffffffffffffffffffffffffffffffffffffffff1614156102e2576102eb565b600090506102ec565b5b9056",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSolidityTest/TestKeywordsFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/TestKeywordsFiller.json
index 4af87bcc6..06130ed2a 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/TestKeywordsFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/TestKeywordsFiller.json
@@ -28,49 +28,49 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//comment1": "contract main",
-		"//comment2": "{",
-		"//comment3": "    bool returnValue;",
-		"//comment4": "    function run() returns (bool)",
-		"//comment5": "    {",
-		"//comment6": "       returnValue = testKeywords();",
-		"//comment7": "       return returnValue;",
-		"//comment8": "    }",
-		"//comment9": "",
-		"//comment10": "    function testKeywords() returns (bool res)",
-		"//comment11": "    {",
-		"//comment12": "        //some simple checks for the if statemnt",
-		"//comment13": "        //if, else, while, for, break, continue, return",
-		"//comment14": "        int i = 0;",
-		"//comment15": "        res = false;",
-		"//comment16": "",
-		"//comment17": "        if (i == 0)",
-		"//comment18": "        {",
-		"//comment19": "            if( i <= -25)",
-		"//comment20": "            {",
-		"//comment21": "                return false;",
-		"//comment22": "            }",
-		"//comment23": "            else",
-		"//comment24": "            {",
-		"//comment25": "                while(i < 10)",
-		"//comment26": "                    i++;",
-		"//comment27": "",
-		"//comment28": "                if (i == 10)",
-		"//comment29": "                {",
-		"//comment30": "                    for(var j=10; j>0; j--)",
-		"//comment31": "                    {",
-		"//comment32": "                        i--;",
-		"//comment33": "                    }",
-		"//comment34": "                }",
-		"//comment35": "            }",
-		"//comment36": "        }",
-		"//comment37": "",
-		"//comment38": "        if (i == 0)",
-		"//comment39": "            return true;",
-		"//comment40": "",
-		"//comment41": "        return false;",
-		"//comment42": "    }",
-		"//comment43": "}",
+                "//comment1": "contract main",
+                "//comment2": "{",
+                "//comment3": "    bool returnValue;",
+                "//comment4": "    function run() returns (bool)",
+                "//comment5": "    {",
+                "//comment6": "       returnValue = testKeywords();",
+                "//comment7": "       return returnValue;",
+                "//comment8": "    }",
+                "//comment9": "",
+                "//comment10": "    function testKeywords() returns (bool res)",
+                "//comment11": "    {",
+                "//comment12": "        //some simple checks for the if statemnt",
+                "//comment13": "        //if, else, while, for, break, continue, return",
+                "//comment14": "        int i = 0;",
+                "//comment15": "        res = false;",
+                "//comment16": "",
+                "//comment17": "        if (i == 0)",
+                "//comment18": "        {",
+                "//comment19": "            if( i <= -25)",
+                "//comment20": "            {",
+                "//comment21": "                return false;",
+                "//comment22": "            }",
+                "//comment23": "            else",
+                "//comment24": "            {",
+                "//comment25": "                while(i < 10)",
+                "//comment26": "                    i++;",
+                "//comment27": "",
+                "//comment28": "                if (i == 10)",
+                "//comment29": "                {",
+                "//comment30": "                    for(var j=10; j>0; j--)",
+                "//comment31": "                    {",
+                "//comment32": "                        i--;",
+                "//comment33": "                    }",
+                "//comment34": "                }",
+                "//comment35": "            }",
+                "//comment36": "        }",
+                "//comment37": "",
+                "//comment38": "        if (i == 0)",
+                "//comment39": "            return true;",
+                "//comment40": "",
+                "//comment41": "        return false;",
+                "//comment42": "    }",
+                "//comment43": "}",
                 "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463380e439681146037578063c040622614604757005b603d6084565b8060005260206000f35b604d6057565b8060005260206000f35b6000605f6084565b600060006101000a81548160ff0219169083021790555060ff60016000540416905090565b6000808160011560cd575b600a82121560a157600190910190608f565b81600a1460ac5760c9565b50600a5b60008160ff16111560c85760019182900391900360b0565b5b60d5565b6000925060ed565b8160001460e05760e8565b6001925060ed565b600092505b50509056",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSolidityTest/TestOverflowFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/TestOverflowFiller.json
index b7362d019..e2ca8da4c 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/TestOverflowFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/TestOverflowFiller.json
@@ -28,31 +28,31 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//comment1" : "contract main",
-		"//comment2" : "{",
-		"//comment3" : "    bool returnValue;",
-		"//comment4" : "    function run() returns (bool)",
-		"//comment5" : "    {",
-		"//comment6" : "       returnValue = testOverflow();",
-		"//comment7" : "       return returnValue;",
-		"//comment8" : "    }",
-		"//comment9" : "",
-		"//comment10" : "    function testOverflow() returns (bool res)",
-		"//comment11" : "    {",
-		"//comment12" : "        res = true;",
-		"//comment13" : "        uint256 a = 115792089237316195423570985008687907853269984665640564039457584007913129639935;",
-		"//comment14" : "        if (a + 1 != 0)",
-		"//comment15" : "            return false;",
-		"//comment16" : "",
-		"//comment17" : "        uint32 b = 4294967295;",
-		"//comment18" : "        if (b + 1 != 0)",
-		"//comment19" : "            return false;",
-		"//comment20" : "",
-		"//comment21" : "        uint64 c = 18446744073709551615;",
-		"//comment22" : "        if (c + 1 != 0)",
-		"//comment23" : "            return false;",
-		"//comment24" : "    }",
-		"//comment25" : "}",
+                "//comment1" : "contract main",
+                "//comment2" : "{",
+                "//comment3" : "    bool returnValue;",
+                "//comment4" : "    function run() returns (bool)",
+                "//comment5" : "    {",
+                "//comment6" : "       returnValue = testOverflow();",
+                "//comment7" : "       return returnValue;",
+                "//comment8" : "    }",
+                "//comment9" : "",
+                "//comment10" : "    function testOverflow() returns (bool res)",
+                "//comment11" : "    {",
+                "//comment12" : "        res = true;",
+                "//comment13" : "        uint256 a = 115792089237316195423570985008687907853269984665640564039457584007913129639935;",
+                "//comment14" : "        if (a + 1 != 0)",
+                "//comment15" : "            return false;",
+                "//comment16" : "",
+                "//comment17" : "        uint32 b = 4294967295;",
+                "//comment18" : "        if (b + 1 != 0)",
+                "//comment19" : "            return false;",
+                "//comment20" : "",
+                "//comment21" : "        uint64 c = 18446744073709551615;",
+                "//comment22" : "        if (c + 1 != 0)",
+                "//comment23" : "            return false;",
+                "//comment24" : "    }",
+                "//comment25" : "}",
                 "code" : "0x6000357c0100000000000000000000000000000000000000000000000000000000900480638040cac41461003a578063c04062261461004c57005b610042610099565b8060005260206000f35b61005461005e565b8060005260206000f35b6000610068610099565b600060006101000a81548160ff02191690830217905550600060009054906101000a900460ff169050610096565b90565b60006000600060006001935083507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff925060006001840114156100db576100e4565b6000935061013b565b63ffffffff915060006001830163ffffffff1614156101025761010b565b6000935061013b565b67ffffffffffffffff905060006001820167ffffffffffffffff1614156101315761013a565b6000935061013b565b5b5050509056",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSolidityTest/TestStoreGasPricesFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/TestStoreGasPricesFiller.json
index 3ec40b75c..4a7e1e5b0 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/TestStoreGasPricesFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/TestStoreGasPricesFiller.json
@@ -40,34 +40,34 @@
 		"//comment5" : "  function run() returns (bool)",
 		"//comment6" : "  {",
 		"//comment7" : "     uint startgas = msg.gas;",
-		"//comment8" : "",
-		"//comment9" : "     storage = 1;  //zero to non zero",
-		"//comment10" : "     m_gasUsed[0] = startgas - msg.gas;",
-		"//comment11" : "     startgas = msg.gas;",
-		"//comment12" : "",
-		"//comment13" : "     storage = 2;  //non zero to non zero",
-		"//comment14" : "     m_gasUsed[1] = startgas - msg.gas;",
-		"//comment15" : "     startgas = msg.gas;",
-		"//comment16" : "",
-		"//comment17" : "     storage = 2;  //non zero to same non zero",
-		"//comment18" : "     m_gasUsed[2] = startgas - msg.gas;",
-		"//comment19" : "     startgas = msg.gas;",
-		"//comment20" : "",
-		"//comment21" : "     storage = 24784793845734;  //non zero to huge non zero",
-		"//comment22" : "     m_gasUsed[3] = startgas - msg.gas;",
-		"//comment23" : "     startgas = msg.gas;",
-		"//comment24" : "",
-		"//comment25" : "     storage = 2;  //huge non zero to non zero",
-		"//comment26" : "     m_gasUsed[4] = startgas - msg.gas;",
-		"//comment27" : "     startgas = msg.gas;",
-		"//comment28" : "",
-		"//comment29" : "     storage = 0;  //non zero to zero",
-		"//comment30" : "     m_gasUsed[5] = startgas - msg.gas;",
-		"//comment31" : "     startgas = msg.gas;",
-		"//comment32" : "",
-		"//comment33" : "     return true;",
-		"//comment34" : "  }",
-		"//comment35" : "}",
+                "//comment8" : "",
+                "//comment9" : "     storage = 1;  //zero to non zero",
+                "//comment10" : "     m_gasUsed[0] = startgas - msg.gas;",
+                "//comment11" : "     startgas = msg.gas;",
+                "//comment12" : "",
+                "//comment13" : "     storage = 2;  //non zero to non zero",
+                "//comment14" : "     m_gasUsed[1] = startgas - msg.gas;",
+                "//comment15" : "     startgas = msg.gas;",
+                "//comment16" : "",
+                "//comment17" : "     storage = 2;  //non zero to same non zero",
+                "//comment18" : "     m_gasUsed[2] = startgas - msg.gas;",
+                "//comment19" : "     startgas = msg.gas;",
+                "//comment20" : "",
+                "//comment21" : "     storage = 24784793845734;  //non zero to huge non zero",
+                "//comment22" : "     m_gasUsed[3] = startgas - msg.gas;",
+                "//comment23" : "     startgas = msg.gas;",
+                "//comment24" : "",
+                "//comment25" : "     storage = 2;  //huge non zero to non zero",
+                "//comment26" : "     m_gasUsed[4] = startgas - msg.gas;",
+                "//comment27" : "     startgas = msg.gas;",
+                "//comment28" : "",
+                "//comment29" : "     storage = 0;  //non zero to zero",
+                "//comment30" : "     m_gasUsed[5] = startgas - msg.gas;",
+                "//comment31" : "     startgas = msg.gas;",
+                "//comment32" : "",
+                "//comment33" : "     return true;",
+                "//comment34" : "  }",
+                "//comment35" : "}",
                 "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463c04062268114602d57005b6033603d565b8060005260206000f35b600060005a600160205590505a81036000555a600260205590505a81036001555a600260205590505a81036002555a65168aa8d53fe660205590505a81036003555a600260205590505a81036004555a600060205590505a81036005555a5060019291505056",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSolidityTest/TestStructuresAndVariablessFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/TestStructuresAndVariablessFiller.json
index 53ef8cc9e..660192164 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/TestStructuresAndVariablessFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/TestStructuresAndVariablessFiller.json
@@ -33,49 +33,49 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//comment1" : "contract main",
-		"//comment2" : "{",
-		"//comment3" : "    struct StructTest",
-		"//comment4" : "    {",
-		"//comment5" : "        address addr;",
-		"//comment6" : "        int amount;",
-		"//comment7" : "        bytes32 str;",
-		"//comment8" : "        mapping (uint => address) funders;",
-		"//comment9" : "    }",
-		"//comment10" : "",
-		"//comment11" : "    bool returnValue;",
-		"//comment12" : "    int globalValue;",
-		"//comment13" : "    StructTest globalData;",
-		"//comment14" : "    function run() returns (bool)",
-		"//comment15" : "    {",
-		"//comment16" : "        globalValue = 255;",
-		"//comment17" : "        globalData.addr = 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b;",
-		"//comment18" : "        globalData.amount = 255;",
-		"//comment19" : "        globalData.str = 'global data 32 length string';",
-		"//comment20" : "        globalData.funders[0] = 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b;",
-		"//comment21" : "        returnValue = testStructuresAndVariabless();",
-		"//comment22" : "        return returnValue;",
-		"//comment23" : "    }",
-		"//comment24" : "",
-		"//comment25" : "    function testStructuresAndVariabless() returns (bool res)",
-		"//comment26" : "    {",
-		"//comment27" : "        res = true;",
-		"//comment28" : "        if (globalValue != 255)",
-		"//comment29" : "            return false;",
-		"//comment30" : "",
-		"//comment31" : "        if (globalValue != globalData.amount)",
-		"//comment32" : "            return false;",
-		"//comment33" : "",
-		"//comment34" : "        if (globalData.addr != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)",
-		"//comment35" : "            return false;",
-		"//comment36" : "",
-		"//comment37" : "        if (globalData.str != 'global data 32 length string')",
-		"//comment38" : "            return false;",
-		"//comment39" : "",
-		"//comment40" : "        if (globalData.funders[0] != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)",
-		"//comment41" : "            return false;",
-		"//comment42" : "    }",
-		"//comment43" : "}",
+                "//comment1" : "contract main",
+                "//comment2" : "{",
+                "//comment3" : "    struct StructTest",
+                "//comment4" : "    {",
+                "//comment5" : "        address addr;",
+                "//comment6" : "        int amount;",
+                "//comment7" : "        bytes32 str;",
+                "//comment8" : "        mapping (uint => address) funders;",
+                "//comment9" : "    }",
+                "//comment10" : "",
+                "//comment11" : "    bool returnValue;",
+                "//comment12" : "    int globalValue;",
+                "//comment13" : "    StructTest globalData;",
+                "//comment14" : "    function run() returns (bool)",
+                "//comment15" : "    {",
+                "//comment16" : "        globalValue = 255;",
+                "//comment17" : "        globalData.addr = 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b;",
+                "//comment18" : "        globalData.amount = 255;",
+                "//comment19" : "        globalData.str = 'global data 32 length string';",
+                "//comment20" : "        globalData.funders[0] = 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b;",
+                "//comment21" : "        returnValue = testStructuresAndVariabless();",
+                "//comment22" : "        return returnValue;",
+                "//comment23" : "    }",
+                "//comment24" : "",
+                "//comment25" : "    function testStructuresAndVariabless() returns (bool res)",
+                "//comment26" : "    {",
+                "//comment27" : "        res = true;",
+                "//comment28" : "        if (globalValue != 255)",
+                "//comment29" : "            return false;",
+                "//comment30" : "",
+                "//comment31" : "        if (globalValue != globalData.amount)",
+                "//comment32" : "            return false;",
+                "//comment33" : "",
+                "//comment34" : "        if (globalData.addr != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)",
+                "//comment35" : "            return false;",
+                "//comment36" : "",
+                "//comment37" : "        if (globalData.str != 'global data 32 length string')",
+                "//comment38" : "            return false;",
+                "//comment39" : "",
+                "//comment40" : "        if (globalData.funders[0] != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)",
+                "//comment41" : "            return false;",
+                "//comment42" : "    }",
+                "//comment43" : "}",
                 "code" : "0x7c010000000000000000000000000000000000000000000000000000000060003504632a9afb838114610039578063c04062261461004b57005b61004161005d565b8060005260206000f35b61005361016c565b8060005260206000f35b600160ff8154141561006e57610076565b506000610169565b60015460035414156100875761008f565b506000610169565b73a94f5374fce5edbc8e2a8697c15331677e6ebf0b73ffffffffffffffffffffffffffffffffffffffff60016002540481161614156100cd576100d5565b506000610169565b7f676c6f62616c2064617461203332206c656e67746820737472696e670000000060045414156101045761010c565b506000610169565b6005600080815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673a94f5374fce5edbc8e2a8697c15331677e6ebf0b141561016057610168565b506000610169565b5b90565b600060ff806001555073a94f5374fce5edbc8e2a8697c15331677e6ebf0b6002805473ffffffffffffffffffffffffffffffffffffffff1916821790555060ff80600355507f676c6f62616c2064617461203332206c656e67746820737472696e6700000000806004555073a94f5374fce5edbc8e2a8697c15331677e6ebf0b6005600080815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff0219169083021790555061022f61005d565b600060006101000a81548160ff0219169083021790555060ff6001600054041690509056",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLCODEFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLCODEFiller.json
index 669956da7..447f00264 100644
--- a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLCODEFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLCODEFiller.json
@@ -61,11 +61,11 @@
             },
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
-		"nonce" : "0",
-		"comment" : " Zero-value call to nonexistent account: should (i) charge only 700 gas, (ii) not create an account",
-		"code" : "{ [[0]](GAS) [[1]] (CALLCODE 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }",
-		"storage": {
-		}
+                "nonce" : "0",
+                "//comment" : " Zero-value call to nonexistent account: should (i) charge only 700 gas, (ii) not create an account",
+                "code" : "{ [[0]](GAS) [[1]] (CALLCODE 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }",
+                "storage": {
+                }
             }
         },
         "transaction" : {
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLFiller.json
index ea3952187..fd3d2c030 100644
--- a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLFiller.json
@@ -89,11 +89,11 @@
             },
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
-		"nonce" : "0",
-		"comment" : " Zero-value call to nonexistent account: should (i) charge only 700 gas, (ii) not create an account",
-		"code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }",
-		"storage": {
-		}
+                "nonce" : "0",
+                "//comment" : " Zero-value call to nonexistent account: should (i) charge only 700 gas, (ii) not create an account",
+                "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }",
+                "storage": {
+                }
             }
         },
         "transaction" : {
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToEmptyFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToEmptyFiller.json
index a63ea92e7..beb12498d 100644
--- a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToEmptyFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToEmptyFiller.json
@@ -89,11 +89,11 @@
             },
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
-		"nonce" : "0",
-		"comment" : " Zero-value call to empty account: should (i) charge only 700 gas, (ii) delete an account",
-		"code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }",
-		"storage": {
-		}
+                "nonce" : "0",
+                "//comment" : " Zero-value call to empty account: should (i) charge only 700 gas, (ii) delete an account",
+                "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }",
+                "storage": {
+                }
             },
 	    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "",
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToNonZeroBalanceFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToNonZeroBalanceFiller.json
index e5f0e61d1..6cfc8a2fe 100644
--- a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToNonZeroBalanceFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToNonZeroBalanceFiller.json
@@ -61,11 +61,11 @@
             },
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
-		"nonce" : "0",
-		"comment" : " Zero-value call to empty account: should (i) charge only 700 gas, (ii) delete an account",
-		"code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }",
-		"storage": {
-		}
+                "nonce" : "0",
+                "//comment" : " Zero-value call to empty account: should (i) charge only 700 gas, (ii) delete an account",
+                "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }",
+                "storage": {
+                }
             },
 	    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "100",
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToOneStorageKeyFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToOneStorageKeyFiller.json
index 0c49b0185..ee6a631fe 100644
--- a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToOneStorageKeyFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToOneStorageKeyFiller.json
@@ -91,11 +91,11 @@
             },
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
-		"nonce" : "0",
-		"comment" : " Zero-value call to empty account: should (i) charge only 700 gas, (ii) delete an account",
-		"code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }",
-		"storage": {
-		}
+                "nonce" : "0",
+                "//comment" : " Zero-value call to empty account: should (i) charge only 700 gas, (ii) delete an account",
+                "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }",
+                "storage": {
+                }
             },
 	    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "",
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALL_ToOneStorageKeyFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALL_ToOneStorageKeyFiller.json
index 4a3ecc36d..7fff171e2 100644
--- a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALL_ToOneStorageKeyFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALL_ToOneStorageKeyFiller.json
@@ -30,9 +30,11 @@
                 },
                 "network" : ["Frontier", "Homestead", "EIP150"],
                 "result" : {
+		    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
 		        "storage" : {
 			    "0x00" : "0x01"
 		        }
+		    }
                 }
             }
         ],
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/pairingTestFiller.json b/src/GeneralStateTestsFiller/stZeroKnowledge/pairingTestFiller.json
index b5507b80e..b887a7353 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/pairingTestFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/pairingTestFiller.json
@@ -69,16 +69,16 @@
             },
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "",
-		"//comment1" : "zeroCash transaction data",
-		"//comment2" : "inputLength, data1, data2, data3, ...",
-		"code" : "{(MSTORE 32 (CALLDATALOAD 32)) (MSTORE 64 (CALLDATALOAD 64)) (MSTORE 96 (CALLDATALOAD 96)) (MSTORE 128 (CALLDATALOAD 128)) (MSTORE 160 (CALLDATALOAD 160)) (MSTORE 192 (CALLDATALOAD 192)) (MSTORE 224 (CALLDATALOAD 224)) (MSTORE 256 (CALLDATALOAD 256)) (MSTORE 288 (CALLDATALOAD 288)) (MSTORE 320 (CALLDATALOAD 320)) (MSTORE 352 (CALLDATALOAD 352)) (MSTORE 384 (CALLDATALOAD 384)) (MSTORE 416 (CALLDATALOAD 416)) (MSTORE 448 (CALLDATALOAD 448)) (MSTORE 480 (CALLDATALOAD 480)) (MSTORE 512 (CALLDATALOAD 512)) (MSTORE 544 (CALLDATALOAD 544)) (MSTORE 576 (CALLDATALOAD 576)) (MSTORE 608 (CALLDATALOAD 608)) (MSTORE 640 (CALLDATALOAD 640)) (MSTORE 672 (CALLDATALOAD 672)) (MSTORE 704 (CALLDATALOAD 704)) (MSTORE 736 (CALLDATALOAD 736)) [[0]](CALLCODE 500000 8 0 32 (CALLDATALOAD 0) 1000 32)  [[1]] (MLOAD 1000) }",
+                "//comment1" : "zeroCash transaction data",
+                "//comment2" : "inputLength, data1, data2, data3, ...",
+                "code" : "{(MSTORE 32 (CALLDATALOAD 32)) (MSTORE 64 (CALLDATALOAD 64)) (MSTORE 96 (CALLDATALOAD 96)) (MSTORE 128 (CALLDATALOAD 128)) (MSTORE 160 (CALLDATALOAD 160)) (MSTORE 192 (CALLDATALOAD 192)) (MSTORE 224 (CALLDATALOAD 224)) (MSTORE 256 (CALLDATALOAD 256)) (MSTORE 288 (CALLDATALOAD 288)) (MSTORE 320 (CALLDATALOAD 320)) (MSTORE 352 (CALLDATALOAD 352)) (MSTORE 384 (CALLDATALOAD 384)) (MSTORE 416 (CALLDATALOAD 416)) (MSTORE 448 (CALLDATALOAD 448)) (MSTORE 480 (CALLDATALOAD 480)) (MSTORE 512 (CALLDATALOAD 512)) (MSTORE 544 (CALLDATALOAD 544)) (MSTORE 576 (CALLDATALOAD 576)) (MSTORE 608 (CALLDATALOAD 608)) (MSTORE 640 (CALLDATALOAD 640)) (MSTORE 672 (CALLDATALOAD 672)) (MSTORE 704 (CALLDATALOAD 704)) (MSTORE 736 (CALLDATALOAD 736)) [[0]](CALLCODE 500000 8 0 32 (CALLDATALOAD 0) 1000 32)  [[1]] (MLOAD 1000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
 	    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "",
-		"//comment1" : "NEGATE",
+                "//comment" : "NEGATE",
                 "code" : "{ (MSTORE 0 (CALLDATALOAD 0)) (MSTORE 32 (CALLDATALOAD 32)) (MSTORE 64 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000)  [[0]](CALLCODE 5000000 7 0 0 96 1000 64)  [[1]](MLOAD 1000) [[2]](MLOAD 1032) }",
                 "nonce" : "0",
                 "storage" : {
@@ -86,7 +86,7 @@
             },
 	    "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "",
-		"//comment1" : "ADD",
+                "//comment" : "ADD",
                 "code" : "{ (MSTORE 0 (CALLDATALOAD 0)) (MSTORE 32 (CALLDATALOAD 32)) (MSTORE 64 (CALLDATALOAD 64)) (MSTORE 96 (CALLDATALOAD 96)) [[0]](CALLCODE 5000000 6 0 0 128 1000 64)  [[1]](MLOAD 1000) [[2]](MLOAD 1032) }",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_0Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_21000_0Filler.json
index 6955fc481..6955fc481 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_0Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_21000_0Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_21000_128Filler.json
index b7ae654b0..b7ae654b0 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_192Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_21000_192Filler.json
index 7184c1caa..7184c1caa 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_192Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_21000_192Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_64Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_21000_64Filler.json
index 41dac488a..41dac488a 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_64Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_21000_64Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_21000_80Filler.json
index 9d84bd610..9d84bd610 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_21000_80Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_0Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_25000_0Filler.json
index f73ad46a1..f73ad46a1 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_0Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_25000_0Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_25000_128Filler.json
index 4ebc8cb5e..4ebc8cb5e 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_25000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_192Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_25000_192Filler.json
index 430b0cff2..430b0cff2 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_192Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_25000_192Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_64Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_25000_64Filler.json
index 8fd985962..8fd985962 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_64Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_25000_64Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_25000_80Filler.json
index d4d25ae63..d4d25ae63 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_25000_80Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-2_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_1-2_21000_128Filler.json
index 712068304..712068304 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-2_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_1-2_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-2_21000_192Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_1-2_21000_192Filler.json
index da0474072..da0474072 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-2_21000_192Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_1-2_21000_192Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-2_25000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_1-2_25000_128Filler.json
index 323323f3a..323323f3a 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-2_25000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_1-2_25000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-2_25000_192Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_1-2_25000_192Filler.json
index 736a997a5..736a997a5 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-2_25000_192Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_1-2_25000_192Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-3_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_1-3_21000_128Filler.json
index 0ffc71203..0ffc71203 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-3_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_1-3_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-3_25000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_1-3_25000_128Filler.json
index b1aa51d46..b1aa51d46 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-3_25000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_1-3_25000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-3_1-2_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-3_1-2_21000_128Filler.json
index fae3cc1a5..fae3cc1a5 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-3_1-2_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-3_1-2_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-3_1-2_25000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-3_1-2_25000_128Filler.json
index 5b1184d78..5b1184d78 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-3_1-2_25000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-3_1-2_25000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_0-0_21000_128Filler.json
index 588ec0ffc..588ec0ffc 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_0-0_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_21000_192Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_0-0_21000_192Filler.json
index 60a1d748a..60a1d748a 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_21000_192Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_0-0_21000_192Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_21000_64Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_0-0_21000_64Filler.json
index c123f2ef9..c123f2ef9 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_21000_64Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_0-0_21000_64Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_25000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_0-0_25000_128Filler.json
index 3075e43ff..3075e43ff 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_25000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_0-0_25000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_25000_192Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_0-0_25000_192Filler.json
index b0068243f..b0068243f 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_25000_192Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_0-0_25000_192Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_25000_64Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_0-0_25000_64Filler.json
index b554fd206..b554fd206 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_25000_64Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_0-0_25000_64Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_1-2_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_1-2_21000_128Filler.json
index 9aa1899e8..9aa1899e8 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_1-2_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_1-2_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_1-2_21000_192Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_1-2_21000_192Filler.json
index 441d0946f..441d0946f 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_1-2_21000_192Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_1-2_21000_192Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_1-2_25000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_1-2_25000_128Filler.json
index 2fa8768c0..2fa8768c0 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_1-2_25000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_1-2_25000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_1-2_25000_192Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_1-2_25000_192Filler.json
index 854622218..854622218 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_1-2_25000_192Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_1-2_25000_192Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-3_0-0_21000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-3_0-0_21000_80Filler.json
index 04ad54cb1..04ad54cb1 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-3_0-0_21000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-3_0-0_21000_80Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-3_0-0_25000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-3_0-0_25000_80Filler.json
index 45b7785fb..45b7785fb 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-3_0-0_25000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-3_0-0_25000_80Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1145-3932_1145-4651_21000_192Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1145-3932_1145-4651_21000_192Filler.json
index 5af0b551f..5af0b551f 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1145-3932_1145-4651_21000_192Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1145-3932_1145-4651_21000_192Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1145-3932_1145-4651_25000_192Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1145-3932_1145-4651_25000_192Filler.json
index 351c61f24..351c61f24 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1145-3932_1145-4651_25000_192Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1145-3932_1145-4651_25000_192Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1145-3932_2969-1336_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1145-3932_2969-1336_21000_128Filler.json
index b11395b88..b11395b88 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1145-3932_2969-1336_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1145-3932_2969-1336_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1145-3932_2969-1336_25000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1145-3932_2969-1336_25000_128Filler.json
index 4a77bdc0b..4a77bdc0b 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1145-3932_2969-1336_25000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1145-3932_2969-1336_25000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_6-9_19274124-124124_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_6-9_19274124-124124_21000_128Filler.json
index 0c3a60880..0c3a60880 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_6-9_19274124-124124_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_6-9_19274124-124124_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_6-9_19274124-124124_25000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_6-9_19274124-124124_25000_128Filler.json
index f633c27e0..f633c27e0 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_6-9_19274124-124124_25000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_6-9_19274124-124124_25000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_0Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_21000_0Filler.json
index 60ebeb904..60ebeb904 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_0Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_21000_0Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_21000_128Filler.json
index 5543dd7bd..5543dd7bd 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_40Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_21000_40Filler.json
index 627e1fa08..627e1fa08 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_40Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_21000_40Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_64Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_21000_64Filler.json
index 09810f500..09810f500 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_64Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_21000_64Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_21000_80Filler.json
index daac322e5..daac322e5 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_21000_80Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_21000_96Filler.json
index 065b12f16..065b12f16 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_21000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_0Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_28000_0Filler.json
index ccaba8a32..ccaba8a32 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_0Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_28000_0Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_28000_128Filler.json
index a8a52f576..a8a52f576 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_28000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_40Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_28000_40Filler.json
index d50901904..d50901904 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_40Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_28000_40Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_64Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_28000_64Filler.json
index aeef04694..aeef04694 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_64Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_28000_64Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_28000_80Filler.json
index aedadbd64..aedadbd64 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_28000_80Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_28000_96Filler.json
index 077ba1c02..077ba1c02 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_28000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_1_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_1_21000_128Filler.json
index 3fb334f2f..3fb334f2f 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_1_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_1_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_1_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_1_21000_96Filler.json
index 1ec5f2573..1ec5f2573 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_1_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_1_21000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_1_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_1_28000_128Filler.json
index 604d5288a..604d5288a 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_1_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_1_28000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_1_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_1_28000_96Filler.json
index 2303c5bb9..2303c5bb9 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_1_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_1_28000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_2_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_2_21000_128Filler.json
index 2eaf15610..2eaf15610 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_2_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_2_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_2_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_2_21000_96Filler.json
index 494818b4c..494818b4c 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_2_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_2_21000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_2_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_2_28000_128Filler.json
index 3d57479f7..3d57479f7 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_2_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_2_28000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_2_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_2_28000_96Filler.json
index ad5da7e84..ad5da7e84 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_2_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_2_28000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_128Filler.json
index da55bf745..da55bf745 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_80Filler.json
index 5f145ff11..5f145ff11 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_80Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_96Filler.json
index 19178a220..19178a220 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_128Filler.json
index 50ec22d2f..50ec22d2f 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_80Filler.json
index 22879cbb1..22879cbb1 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_80Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_96Filler.json
index 85b4ce325..85b4ce325 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5616_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_5616_21000_128Filler.json
index 6b4aed90a..6b4aed90a 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5616_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_5616_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5616_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_5616_21000_96Filler.json
index bf4e1f55f..bf4e1f55f 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5616_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_5616_21000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5616_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_5616_28000_128Filler.json
index 83eca7772..83eca7772 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5616_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_5616_28000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5616_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_5616_28000_96Filler.json
index d82ed27c5..d82ed27c5 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5616_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_5616_28000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5617_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_5617_21000_128Filler.json
index 16cbc45f9..16cbc45f9 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5617_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_5617_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5617_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_5617_21000_96Filler.json
index 684416ce2..684416ce2 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5617_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_5617_21000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5617_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_5617_28000_128Filler.json
index aad68ed29..aad68ed29 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5617_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_5617_28000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5617_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_5617_28000_96Filler.json
index c06bad19a..c06bad19a 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5617_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_5617_28000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9935_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_9935_21000_128Filler.json
index 51212cbb9..51212cbb9 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9935_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_9935_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9935_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_9935_21000_96Filler.json
index d938c294d..d938c294d 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9935_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_9935_21000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9935_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_9935_28000_128Filler.json
index 1d3fcc6be..1d3fcc6be 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9935_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_9935_28000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9935_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_9935_28000_96Filler.json
index 8364b1205..8364b1205 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9935_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_9935_28000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_9_21000_128Filler.json
index 196036330..196036330 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_9_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_9_21000_96Filler.json
index 65cac9387..65cac9387 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_9_21000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_9_28000_128Filler.json
index 21552dada..21552dada 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_9_28000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_9_28000_96Filler.json
index b334c860c..b334c860c 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_9_28000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_0_21000_128Filler.json
index 5d553106c..5d553106c 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_0_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_21000_64Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_0_21000_64Filler.json
index cc1589fff..cc1589fff 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_21000_64Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_0_21000_64Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_21000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_0_21000_80Filler.json
index 2bca595f5..2bca595f5 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_21000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_0_21000_80Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_0_21000_96Filler.json
index 2c4883ea9..2c4883ea9 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_0_21000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_0_28000_128Filler.json
index 925a2503b..925a2503b 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_0_28000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_28000_64Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_0_28000_64Filler.json
index c839cae0c..c839cae0c 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_28000_64Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_0_28000_64Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_28000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_0_28000_80Filler.json
index f3213f201..f3213f201 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_28000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_0_28000_80Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_0_28000_96Filler.json
index 2212cf61a..2212cf61a 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_0_28000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_1_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_1_21000_128Filler.json
index 1f2e5eff5..1f2e5eff5 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_1_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_1_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_1_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_1_21000_96Filler.json
index 34b4a607b..34b4a607b 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_1_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_1_21000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_1_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_1_28000_128Filler.json
index b2c27f6de..b2c27f6de 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_1_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_1_28000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_1_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_1_28000_96Filler.json
index 48798a138..48798a138 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_1_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_1_28000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_2_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_2_21000_128Filler.json
index 02620320e..02620320e 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_2_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_2_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_2_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_2_21000_96Filler.json
index f652f4a1a..f652f4a1a 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_2_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_2_21000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_2_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_2_28000_128Filler.json
index b908c55d2..b908c55d2 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_2_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_2_28000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_2_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_2_28000_96Filler.json
index 2571260c6..2571260c6 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_2_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_2_28000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_128Filler.json
index 32309fd64..32309fd64 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_80Filler.json
index 4550b3bac..4550b3bac 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_80Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_96Filler.json
index b4dc6b595..b4dc6b595 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_128Filler.json
index f9e615a5f..f9e615a5f 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_80Filler.json
index 76dbd5919..76dbd5919 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_80Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_96Filler.json
index 48d641fd1..48d641fd1 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5616_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5616_21000_128Filler.json
index 31efca781..31efca781 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5616_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5616_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5616_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5616_21000_96Filler.json
index 035820643..035820643 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5616_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5616_21000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5616_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5616_28000_128Filler.json
index 6d382d596..6d382d596 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5616_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5616_28000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5616_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5616_28000_96Filler.json
index 7a2a5240d..7a2a5240d 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5616_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5616_28000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5617_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5617_21000_128Filler.json
index f2ab6aa8e..f2ab6aa8e 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5617_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5617_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5617_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5617_21000_96Filler.json
index f5eec0866..f5eec0866 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5617_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5617_21000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5617_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5617_28000_128Filler.json
index c557b31fd..c557b31fd 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5617_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5617_28000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5617_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5617_28000_96Filler.json
index e0f7497e8..e0f7497e8 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5617_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5617_28000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9935_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_9935_21000_128Filler.json
index 23f7a3a72..23f7a3a72 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9935_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_9935_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9935_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_9935_21000_96Filler.json
index 21d6e8186..21d6e8186 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9935_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_9935_21000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9935_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_9935_28000_128Filler.json
index 5424c8d8d..5424c8d8d 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9935_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_9935_28000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9935_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_9935_28000_96Filler.json
index 5d83d212c..5d83d212c 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9935_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_9935_28000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_9_21000_128Filler.json
index db3310a81..db3310a81 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_9_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_9_21000_96Filler.json
index 61215a9d3..61215a9d3 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_9_21000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_9_28000_128Filler.json
index 31e19d2f9..31e19d2f9 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_9_28000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_9_28000_96Filler.json
index 4670e053e..4670e053e 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_9_28000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_0_21000_128Filler.json
index 3d6cead69..3d6cead69 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_0_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_21000_64Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_0_21000_64Filler.json
index ad6793e6f..ad6793e6f 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_21000_64Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_0_21000_64Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_21000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_0_21000_80Filler.json
index 191521dae..191521dae 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_21000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_0_21000_80Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_0_21000_96Filler.json
index 3654276fb..3654276fb 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_0_21000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_0_28000_128Filler.json
index 61ee13cac..61ee13cac 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_0_28000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_28000_64Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_0_28000_64Filler.json
index a4eef97d0..a4eef97d0 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_28000_64Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_0_28000_64Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_28000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_0_28000_80Filler.json
index 86d1a3404..86d1a3404 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_28000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_0_28000_80Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_0_28000_96Filler.json
index 35561cef6..35561cef6 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_0_28000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_1_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_1_21000_128Filler.json
index 2c16ac11f..2c16ac11f 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_1_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_1_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_1_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_1_21000_96Filler.json
index 3de32bebc..3de32bebc 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_1_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_1_21000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_1_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_1_28000_128Filler.json
index 6cabd70a6..6cabd70a6 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_1_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_1_28000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_1_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_1_28000_96Filler.json
index 262bfa4cd..262bfa4cd 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_1_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_1_28000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_2_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_2_21000_128Filler.json
index 6606dc3ea..6606dc3ea 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_2_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_2_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_2_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_2_21000_96Filler.json
index 73d87271c..73d87271c 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_2_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_2_21000_96Filler.json