refill precompiled tests

add execution on <100000 100000+x  >100000 gas for each test

97 files changed, 132 insertions, 155 deletions

diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexpFiller.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexpFiller.json
index 65ed0dab8..9f32208e1 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexpFiller.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexpFiller.json
@@ -12,7 +12,7 @@
 	    {
                 "indexes" : {
                     "data" : -1,
-                    "gas" : -1,
+                    "gas" : 0,
                     "value" : -1
                 },
                 "network" : [ "EIP150", "EIP158"],
@@ -28,7 +28,7 @@
             {
                 "indexes" : {
                     "data" : [0,6,7],
-                    "gas" : -1,
+                    "gas" : 0,
                     "value" : -1
                 },
                 "network" : ["Byzantium"],
@@ -44,7 +44,7 @@
             {
                 "indexes" : {
                     "data" : [29],
-                    "gas" : -1,
+                    "gas" : 0,
                     "value" : -1
                 },
                 "network" : ["Byzantium"],
@@ -60,7 +60,7 @@
 	    {
                 "indexes" : {
                     "data" : [1,5,8,9,10,12,13,15,18,19,20,21,22,23,24,30],
-                    "gas" : -1,
+                    "gas" : 0,
                     "value" : -1
                 },
                 "network" : ["Byzantium"],
@@ -76,7 +76,7 @@
 	    {
                 "indexes" : {
                     "data" : [2,28],
-                    "gas" : -1,
+                    "gas" : 0,
                     "value" : -1
                 },
                 "network" : ["Byzantium"],
@@ -92,7 +92,7 @@
 	    {
                 "indexes" : {
                     "data" : [3,4],
-                    "gas" : -1,
+                    "gas" : 0,
                     "value" : -1
                 },
                 "network" : ["Byzantium"],
@@ -108,7 +108,7 @@
 	    {
                 "indexes" : {
                     "data" : [11, 14, 25, 26],
-                    "gas" : -1,
+                    "gas" : 0,
                     "value" : -1
                 },
                 "network" : ["Byzantium"],
@@ -124,7 +124,7 @@
 	    {
                 "indexes" : {
                     "data" : [16,27],
-                    "gas" : -1,
+                    "gas" : 0,
                     "value" : -1
                 },
                 "network" : ["Byzantium"],
@@ -140,7 +140,7 @@
 	    {
                 "indexes" : {
                     "data" : [17],
-                    "gas" : -1,
+                    "gas" : 0,
                     "value" : -1
                 },
                 "network" : ["Byzantium"],
@@ -235,7 +235,7 @@
 "0x000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit" : [
-                "100000000"
+                "100000000", "90000", "110000", "200000"
             ],
             "gasPrice" : "1",
             "nonce" : "0",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_1000000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_1000000Filler.json
index f2936eb68..4cca2cdc9 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_1000000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_1000000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xf9858"
+                "0xf9858", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_155000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_155000Filler.json
index 6802ca1a2..ea4880c61 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_155000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_155000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0x2b390"
+                "0x2b390", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_20500Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_20500Filler.json
index 871d84ff6..d2670426d 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_20500Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_20500Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xa62c"
+                "0xa62c", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_22000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_22000Filler.json
index ebc031924..a11ab17b0 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_22000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_22000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xac08"
+                "0xac08", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_25000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_25000Filler.json
index 7c4b0e631..2b783669f 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_25000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_25000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xb7c0"
+                "0xb7c0", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_35000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_35000Filler.json
index 58c919e05..8bab8127c 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_35000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_35000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xded0"
+                "0xded0", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_1000000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_1000000Filler.json
index 723c59135..51c1f5b29 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_1000000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_1000000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xf9958"
+                "0xf9958", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_155000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_155000Filler.json
index b7cb51855..9821a8127 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_155000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_155000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0x2b490"
+                "0x2b490", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_20500Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_20500Filler.json
index 2b492276e..9183161da 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_20500Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_20500Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xa72c"
+                "0xa72c", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_22000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_22000Filler.json
index bc9913238..5ad3ed6ef 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_22000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_22000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xad08"
+                "0xad08", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_25000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_25000Filler.json
index c1ce88205..7e6d55515 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_25000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_25000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xb8c0"
+                "0xb8c0", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_35000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_35000Filler.json
index 572c00137..95bd354fc 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_35000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_1_0_35000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xdfd0"
+                "0xdfd0", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_1000000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_1000000Filler.json
index 2eed300ac..2339522e3 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_1000000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_1000000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xf99d8"
+                "0xf99d8", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_155000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_155000Filler.json
index e29c172fc..a79322105 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_155000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_155000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0x2b510"
+                "0x2b510", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_20500Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_20500Filler.json
index 96130d7e4..8a7bfb978 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_20500Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_20500Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xa7ac"
+                "0xa7ac", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_22000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_22000Filler.json
index 71816541b..7cd5bd33e 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_22000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_22000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xad88"
+                "0xad88", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_25000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_25000Filler.json
index bf5230c7b..f9cca8bb9 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_25000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_25000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xb940"
+                "0xb940", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_35000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_35000Filler.json
index cebce851a..15a42ac82 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_35000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_3_100_35000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010364000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xe050"
+                "0xe050", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_1000000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_1000000Filler.json
index a851d8bea..7fae32c4f 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_1000000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_1000000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xf9958"
+                "0xf9958", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_155000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_155000Filler.json
index ddeef9101..f6eab0d24 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_155000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_155000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0x2b490"
+                "0x2b490", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_20500Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_20500Filler.json
index b6e2748a6..c99848359 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_20500Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_20500Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xa72c"
+                "0xa72c", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_22000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_22000Filler.json
index a95cc4966..db3d4a38a 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_22000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_22000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xad08"
+                "0xad08", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_25000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_25000Filler.json
index d3026a8ff..f86779ac0 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_25000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_25000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xb8c0"
+                "0xb8c0", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_35000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_35000Filler.json
index 2cbc4c419..7e8e8893d 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_35000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_0_35000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xdfd0"
+                "0xdfd0", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_1000000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_1000000Filler.json
index 5be362229..ff4e9e311 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_1000000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_1000000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xf99d8"
+                "0xf99d8", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_155000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_155000Filler.json
index feca4435e..411e6bf81 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_155000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_155000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0x2b510"
+                "0x2b510", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_20500Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_20500Filler.json
index b2cd08da9..27f880561 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_20500Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_20500Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xa7ac"
+                "0xa7ac", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_22000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_22000Filler.json
index 14ac76789..83bcfef18 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_22000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_22000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xad88"
+                "0xad88", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_25000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_25000Filler.json
index 1777b5774..dce5c6663 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_25000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_25000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xb940"
+                "0xb940", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_35000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_35000Filler.json
index 908613abd..09c400999 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_35000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_0_1_35000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000620000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010101000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xe050"
+                "0xe050", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_1000000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_1000000Filler.json
index 7ddb0fa4c..a779e97cb 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_1000000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_1000000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xf9a58"
+                "0xf9a58", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_155000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_155000Filler.json
index f6f3ccba5..a522d2368 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_155000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_155000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0x2b590"
+                "0x2b590", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_20500Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_20500Filler.json
index 8a4018934..aea27b9a2 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_20500Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_20500Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xa82c"
+                "0xa82c", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_22000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_22000Filler.json
index 51ce35026..79588fb2d 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_22000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_22000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xae08"
+                "0xae08", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_25000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_25000Filler.json
index 8da72200f..57da3658d 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_25000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_25000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xb9c0"
+                "0xb9c0", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_35000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_35000Filler.json
index ebe930019..6b9311838 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_35000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_1_1_1_35000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010101010000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xe0d0"
+                "0xe0d0", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_22411_22000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_22411_22000Filler.json
index 734f75326..48b44c8fe 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_22411_22000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_22411_22000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xf1c8"
+                "0xf1c8", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_1000000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_1000000Filler.json
index 18dc4adbd..aa403a36c 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_1000000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_1000000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97"
             ],
             "gasLimit": [
-                "0xfdd18"
+                "0xfdd18", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
@@ -135,7 +135,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999670418",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -159,7 +158,7 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "329582",
+                        "balance": "874309",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_155000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_155000Filler.json
index f89da88d6..0676fbf5c 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_155000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_155000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97"
             ],
             "gasLimit": [
-                "0x2f850"
+                "0x2f850", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_20500Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_20500Filler.json
index 98a3cb208..d527ffc7c 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_20500Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_20500Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97"
             ],
             "gasLimit": [
-                "0xeaec"
+                "0xeaec", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_22000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_22000Filler.json
index 9c316d79b..5985d0cc3 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_22000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_22000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97"
             ],
             "gasLimit": [
-                "0xf0c8"
+                "0xf0c8", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_25000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_25000Filler.json
index 3e4c087ba..1673aa622 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_25000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_25000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97"
             ],
             "gasLimit": [
-                "0xfc80"
+                "0xfc80", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_35000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_35000Filler.json
index 5f22a03b9..ede4b1f0a 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_35000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_0_35000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000160000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97"
             ],
             "gasLimit": [
-                "0x12390"
+                "0x12390", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_1000000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_1000000Filler.json
index 6dea514b7..a8510cac1 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_1000000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_1000000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xfde18"
+                "0xfde18", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
@@ -135,7 +135,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999670159",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -159,7 +158,7 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "329841",
+                        "balance": "874568",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_155000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_155000Filler.json
index 4de2e81cf..8b10c85d1 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_155000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_155000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0x2f950"
+                "0x2f950", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_20500Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_20500Filler.json
index 320413a4d..48760eea5 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_20500Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_20500Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xebec"
+                "0xebec", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_25000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_25000Filler.json
index 7c851149f..d05f925c4 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_25000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_25000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xfd80"
+                "0xfd80", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_35000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_35000Filler.json
index c4ead820f..be8765be5 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_35000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_1_35000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff970100000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0x12490"
+                "0x12490", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_1000000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_1000000Filler.json
index 89ded208c..7ca5938a6 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_1000000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_1000000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97"
             ],
             "gasLimit": [
-                "0xfff58"
+                "0xfff58", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
@@ -135,7 +135,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999661579",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -159,7 +158,7 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "338421",
+                        "balance": "883148",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_155000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_155000Filler.json
index 82e9f2d8c..cb7e5b9e2 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_155000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_155000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97"
             ],
             "gasLimit": [
-                "0x31a90"
+                "0x31a90", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_20500Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_20500Filler.json
index db6b2cd7a..6f798b23c 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_20500Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_20500Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97"
             ],
             "gasLimit": [
-                "0x10d2c"
+                "0x10d2c", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_22000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_22000Filler.json
index 4e4f9401d..13c5cd87d 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_22000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_22000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97"
             ],
             "gasLimit": [
-                "0x11308"
+                "0x11308", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_25000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_25000Filler.json
index 37c41d4bc..4bbff37d1 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_25000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_25000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97"
             ],
             "gasLimit": [
-                "0x11ec0"
+                "0x11ec0", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_35000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_35000Filler.json
index c772da57e..5d18cd5ca 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_35000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_37111_35000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000080ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97"
             ],
             "gasLimit": [
-                "0x145d0"
+                "0x145d0", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_1000000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_1000000Filler.json
index d63ed682a..621d951b8 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_1000000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_1000000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xfde18"
+                "0xfde18", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
@@ -135,7 +135,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999670159",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -159,7 +158,7 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "329841",
+                        "balance": "874568",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_155000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_155000Filler.json
index 552b3db44..da42e7a71 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_155000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_155000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0x2f950"
+                "0x2f950", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_20500Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_20500Filler.json
index cf62818fd..9ff749a57 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_20500Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_20500Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xebec"
+                "0xebec", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_22000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_22000Filler.json
index 80b725714..d9e477aca 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_22000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_22000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xf1c8"
+                "0xf1c8", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_25000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_25000Filler.json
index 7e885066f..fe14b2a28 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_25000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_25000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xfd80"
+                "0xfd80", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_35000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_35000Filler.json
index d8855dc5e..995c93d0c 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_35000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_37120_37111_97_35000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000161000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000001ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa0ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff976100000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0x12490"
+                "0x12490", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_1000000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_1000000Filler.json
index 09bb3d566..20a0a86b4 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_1000000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_1000000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xfa318"
+                "0xfa318", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
@@ -135,7 +135,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999821738",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -159,7 +158,7 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "178262",
+                        "balance": "178306",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_155000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_155000Filler.json
index a41228003..801842b04 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_155000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_155000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0x2be50"
+                "0x2be50", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
@@ -135,7 +135,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999821738",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -159,7 +158,7 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "178262",
+                        "balance": "178306",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_20500Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_20500Filler.json
index d1cfe0ded..a2df2665c 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_20500Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_20500Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xb0ec"
+                "0xb0ec", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_22000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_22000Filler.json
index cdbd6f4a8..01c94a241 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_22000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_22000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xb6c8"
+                "0xb6c8", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
@@ -135,7 +135,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999821738",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -159,7 +158,7 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "178262",
+                        "balance": "178306",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_25000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_25000Filler.json
index 5e62fd8b7..c71d0928b 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_25000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_25000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xc280"
+                "0xc280", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
@@ -135,7 +135,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999821738",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -159,7 +158,7 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "178262",
+                        "balance": "178306",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_35000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_35000Filler.json
index 43afa1423..f14cb802b 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_35000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_39936_1_55201_35000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a200000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002001000000000000000000000000000000000000000000000000000000000000000001304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db881000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xe990"
+                "0xe990", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
@@ -135,7 +135,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999821738",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -159,7 +158,7 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "178262",
+                        "balance": "178306",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_1000000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_1000000Filler.json
index 53de0c593..52f39200a 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_1000000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_1000000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xf9b58"
+                "0xf9b58", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
@@ -135,7 +135,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999820951",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -159,7 +158,7 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "179049",
+                        "balance": "190113",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_155000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_155000Filler.json
index 8c442d2ae..1f833bca4 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_155000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_155000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0x2b690"
+                "0x2b690", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
@@ -135,7 +135,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999820951",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -159,7 +158,7 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "179049",
+                        "balance": "190113",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_22000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_22000Filler.json
index 2c8784f13..8771864d1 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_22000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_22000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xaf08"
+                "0xaf08", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_25000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_25000Filler.json
index bc8a5d1a9..33211324b 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_25000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_25000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xbac0"
+                "0xbac0", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
@@ -113,7 +113,7 @@
                         "nonce": "1",
                         "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
                         "storage": {
-                            "0x00": "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                            "0x00": "0x00"
                         }
                     },
                     "0000000000000000000000000000000000000005": {
@@ -135,7 +135,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999820951",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -159,7 +158,7 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "179049",
+                        "balance": "179374",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_35000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_35000Filler.json
index d33cfabd0..0564ded6b 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_35000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_09984_39936_35000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xe1d0"
+                "0xe1d0", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
@@ -113,7 +113,7 @@
                         "nonce": "1",
                         "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760c66004356004013511151558576004356004013560200160043560040161014037602161028061014051610160600060056305f5e0fff11558576021610260526102606041806102e08284600060046018f15050506102e08051602082012090506000556102e060206020820352604081510160206001820306601f820103905060208203f350005b",
                         "storage": {
-                            "0x00": "0xc13ad76448cbefd1ee83b801bcd8f33061f2577d6118395e7b44ea21c7ef62e0"
+                            "0x00": "0x00"
                         }
                     },
                     "0000000000000000000000000000000000000005": {
@@ -135,7 +135,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999820951",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -159,7 +158,7 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "179049",
+                        "balance": "189374",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_28948_11579_20500Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_28948_11579_20500Filler.json
index 6e107c384..f99b481b4 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_28948_11579_20500Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_28948_11579_20500Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000a2000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000021034000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xa92c"
+                "0xa92c", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_1000000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_1000000Filler.json
index 0a70b9e1c..6b7cc5f61 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_1000000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_1000000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xf9a58"
+                "0xf9a58", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_155000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_155000Filler.json
index 69f0acd96..834b0d7bc 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_155000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_155000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0x2b590"
+                "0x2b590", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_20500Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_20500Filler.json
index a44a110b3..e58ed239c 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_20500Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_20500Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xa82c"
+                "0xa82c", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_22000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_22000Filler.json
index b9cb5f950..91c701c9b 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_22000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_22000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xae08"
+                "0xae08", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_25000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_25000Filler.json
index ba3407fbb..9cd1b2026 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_25000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_25000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xb9c0"
+                "0xb9c0", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_35000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_35000Filler.json
index 8c5db53df..1e58bcc7b 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_35000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_3_5_100_35000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000630000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010305640000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xe0d0"
+                "0xe0d0", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_1000000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_1000000Filler.json
index 9c864da95..8bb9645bd 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_1000000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_1000000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xf9ad8"
+                "0xf9ad8", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
@@ -135,7 +135,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999823873",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -159,7 +158,7 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "176127",
+                        "balance": "176129",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_155000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_155000Filler.json
index 5076bbd82..8f99ed528 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_155000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_155000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0x2b610"
+                "0x2b610", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
@@ -135,7 +135,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999823873",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -159,7 +158,7 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "176127",
+                        "balance": "176129",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_20500Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_20500Filler.json
index 738dede5b..d1350838d 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_20500Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_20500Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xa8ac"
+                "0xa8ac", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_22000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_22000Filler.json
index 8ce609977..6fa1607df 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_22000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_22000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xae88"
+                "0xae88", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
@@ -135,7 +135,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999823873",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -159,7 +158,7 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "176127",
+                        "balance": "176129",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_25000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_25000Filler.json
index 5a60de574..cdc3858c7 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_25000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_25000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xba40"
+                "0xba40", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
@@ -135,7 +135,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999823873",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -159,7 +158,7 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "176127",
+                        "balance": "176129",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_35000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_35000Filler.json
index e35c005a7..0a3d54ac8 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_35000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_49_2401_2401_35000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000650000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000023109610961000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xe150"
+                "0xe150", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
@@ -135,7 +135,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999823873",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -159,7 +158,7 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "176127",
+                        "balance": "176129",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_1000000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_1000000Filler.json
index c257715f5..78c226694 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_1000000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_1000000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000"
             ],
             "gasLimit": [
-                "0xfaf98"
+                "0xfaf98", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
@@ -135,7 +135,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999815958",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -159,7 +158,7 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "184042",
+                        "balance": "194405",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_155000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_155000Filler.json
index dfd094217..01ddf8a67 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_155000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_155000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000"
             ],
             "gasLimit": [
-                "0x2cad0"
+                "0x2cad0", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
@@ -135,7 +135,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999815958",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -159,7 +158,7 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "184042",
+                        "balance": "194405",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_20500Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_20500Filler.json
index 3eada254b..f79424ab7 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_20500Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_20500Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000"
             ],
             "gasLimit": [
-                "0xbd6c"
+                "0xbd6c", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_22000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_22000Filler.json
index 17b8c3b6b..9b445a521 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_22000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_22000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000"
             ],
             "gasLimit": [
-                "0xc348"
+                "0xc348", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_25000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_25000Filler.json
index 1a48e4bee..9eae4cea3 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_25000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_25000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000"
             ],
             "gasLimit": [
-                "0xcf00"
+                "0xcf00", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
@@ -113,7 +113,7 @@
                         "nonce": "1",
                         "code": "0x600035601c52740100000000000000000000000000000000000000006020526fffffffffffffffffffffffffffffffff6040527fffffffffffffffffffffffffffffffff000000000000000000000000000000016060527402540be3fffffffffffffffffffffffffdabf41c006080527ffffffffffffffffffffffffdabf41c00000000000000000000000002540be40060a0526330c8d1da600051141561012b5760d86004356004013511151558576004356004013560200160043560040161014037601461028061014051610160600060056305f5e0fff11558576014610260526102606034806102c08284600060046017f15050506102c08051602082012090506000556102c060206020820352604081510160206001820306601f820103905060208203f350005b",
                         "storage": {
-                            "0x00": "0xc180ec8d162fccdd700a086100d56543bccabfc357ba4c070df23a92790537bb"
+                            "0x00": "0x00"
                         }
                     },
                     "0000000000000000000000000000000000000005": {
@@ -135,7 +135,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999815958",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -159,7 +158,7 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "184042",
+                        "balance": "184558",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_35000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_35000Filler.json
index 570f4475b..0aa6a07c8 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_35000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_55190_55190_42965_35000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000b4000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000014304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876304d37f120d696c834550e63d9bb9c14b4f9165c9ede434e4644e3998d6db876fffffffffffffffffffffffffffffffffffffff5000000000000000000000000"
             ],
             "gasLimit": [
-                "0xf610"
+                "0xf610", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
@@ -135,7 +135,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999815958",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -159,7 +158,7 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "184042",
+                        "balance": "194405",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_1000000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_1000000Filler.json
index 6e2ba8e70..bf0601fde 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_1000000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_1000000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xfde18"
+                "0xfde18", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
@@ -135,7 +135,6 @@
                         "storage": {}
                     },
                     "82a978b3f5962a5b0957d9ee9eef472ee55b42f1": {
-                        "balance": "999999999999670113",
                         "nonce": "2",
                         "code": "0x",
                         "storage": {}
@@ -159,7 +158,7 @@
                         "storage": {}
                     },
                     "3535353535353535353535353535353535353535": {
-                        "balance": "329887",
+                        "balance": "874614",
                         "nonce": "0",
                         "code": "0x",
                         "storage": {}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_155000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_155000Filler.json
index b36912b1f..986122b72 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_155000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_155000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0x2f950"
+                "0x2f950", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_20500Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_20500Filler.json
index 02ea0bf33..07f72dc27 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_20500Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_20500Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xebec"
+                "0xebec", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_22000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_22000Filler.json
index 82002f62c..76a2eeb00 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_22000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_22000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xf1c8"
+                "0xf1c8", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_35000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_35000Filler.json
index b239db037..31d0936ee 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_35000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_37111_37111_35000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0x12490"
+                "0x12490", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_3711_37111_25000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_3711_37111_25000Filler.json
index 43f2c607e..ad59f927f 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_3711_37111_25000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_9_3711_37111_25000Filler.json
@@ -81,7 +81,7 @@
                 "0x30c8d1da0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000016100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000008009ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff97ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff9700000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit": [
-                "0xfd80"
+                "0xfd80", "90000", "110000", "200000"
             ],
             "gasPrice": "0x1",
             "nonce": "0x1",