489 files changed, 1188 insertions, 728 deletions

diff --git a/src/GeneralStateTestsFiller/stAttackTest/CrashingTransactionFiller.json b/src/GeneralStateTestsFiller/stAttackTest/CrashingTransactionFiller.json
index 295f60c2a..7270d6756 100644
--- a/src/GeneralStateTestsFiller/stAttackTest/CrashingTransactionFiller.json
+++ b/src/GeneralStateTestsFiller/stAttackTest/CrashingTransactionFiller.json
@@ -1,8 +1,8 @@
 {
     "CrashingTransaction" : {
-	"_info" : {
-	    "comment" : "https://ropsten.etherscan.io/tx/0x8ec445380649f6c75a042a438ea9256c2fab2a6a3437904c9e5a712fcbf8a54a"
-	},
+        "_info" : {
+            "comment" : "https://ropsten.etherscan.io/tx/0x8ec445380649f6c75a042a438ea9256c2fab2a6a3437904c9e5a712fcbf8a54a"
+        },
         "env" : {
             "currentCoinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stBadOpcode/badOpcodesFiller.json b/src/GeneralStateTestsFiller/stBadOpcode/badOpcodesFiller.json
index fc55e5f6b..d34cb88ff 100644
--- a/src/GeneralStateTestsFiller/stBadOpcode/badOpcodesFiller.json
+++ b/src/GeneralStateTestsFiller/stBadOpcode/badOpcodesFiller.json
@@ -46,128 +46,128 @@
         },
         "transaction" : {
             "data" : [
-"0x60016001600160015800006000f3",
-"0x60016001600160010c60006000f3",
-"0x60016001600160010d60006000f3",
-"0x60016001600160010e60006000f3",
-"0x60016001600160010f60006000f3",
-"0x60016001600160011b60006000f3",
-"0x60016001600160011c60006000f3",
-"0x60016001600160011d60006000f3",
-"0x60016001600160011e60006000f3",
-"0x60016001600160011f60006000f3",
-"0x60016001600160012160006000f3",
-"0x60016001600160012260006000f3",
-"0x60016001600160012360006000f3",
-"0x60016001600160012460006000f3",
-"0x60016001600160012560006000f3",
-"0x60016001600160012660006000f3",
-"0x60016001600160012760006000f3",
-"0x60016001600160012860006000f3",
-"0x60016001600160012960006000f3",
-"0x60016001600160012a60006000f3",
-"0x60016001600160012b60006000f3",
-"0x60016001600160012c60006000f3",
-"0x60016001600160012d60006000f3",
-"0x60016001600160012e60006000f3",
-"0x60016001600160012f60006000f3",
-"0x60016001600160013f60006000f3",
-"0x60016001600160014660006000f3",
-"0x60016001600160014760006000f3",
-"0x60016001600160014860006000f3",
-"0x60016001600160014960006000f3",
-"0x60016001600160014a60006000f3",
-"0x60016001600160014b60006000f3",
-"0x60016001600160014c60006000f3",
-"0x60016001600160014d60006000f3",
-"0x60016001600160014e60006000f3",
-"0x60016001600160014f60006000f3",
-"0x60016001600160015c60006000f3",
-"0x60016001600160015d60006000f3",
-"0x60016001600160015e60006000f3",
-"0x60016001600160015f60006000f3",
-"0x6001600160016001a560006000f3",
-"0x6001600160016001a660006000f3",
-"0x6001600160016001a760006000f3",
-"0x6001600160016001a860006000f3",
-"0x6001600160016001a960006000f3",
-"0x6001600160016001aa60006000f3",
-"0x6001600160016001ab60006000f3",
-"0x6001600160016001ac60006000f3",
-"0x6001600160016001ad60006000f3",
-"0x6001600160016001ae60006000f3",
-"0x6001600160016001af60006000f3",
-"0x6001600160016001b060006000f3",
-"0x6001600160016001b160006000f3",
-"0x6001600160016001b260006000f3",
-"0x6001600160016001b360006000f3",
-"0x6001600160016001b460006000f3",
-"0x6001600160016001b560006000f3",
-"0x6001600160016001b660006000f3",
-"0x6001600160016001b760006000f3",
-"0x6001600160016001b860006000f3",
-"0x6001600160016001b960006000f3",
-"0x6001600160016001ba60006000f3",
-"0x6001600160016001bb60006000f3",
-"0x6001600160016001bc60006000f3",
-"0x6001600160016001bd60006000f3",
-"0x6001600160016001be60006000f3",
-"0x6001600160016001bf60006000f3",
-"0x6001600160016001c060006000f3",
-"0x6001600160016001c160006000f3",
-"0x6001600160016001c260006000f3",
-"0x6001600160016001c360006000f3",
-"0x6001600160016001c460006000f3",
-"0x6001600160016001c560006000f3",
-"0x6001600160016001c660006000f3",
-"0x6001600160016001c760006000f3",
-"0x6001600160016001c860006000f3",
-"0x6001600160016001c960006000f3",
-"0x6001600160016001ca60006000f3",
-"0x6001600160016001cb60006000f3",
-"0x6001600160016001cc60006000f3",
-"0x6001600160016001cd60006000f3",
-"0x6001600160016001ce60006000f3",
-"0x6001600160016001cf60006000f3",
-"0x6001600160016001d060006000f3",
-"0x6001600160016001d160006000f3",
-"0x6001600160016001d260006000f3",
-"0x6001600160016001d360006000f3",
-"0x6001600160016001d460006000f3",
-"0x6001600160016001d560006000f3",
-"0x6001600160016001d660006000f3",
-"0x6001600160016001d760006000f3",
-"0x6001600160016001d860006000f3",
-"0x6001600160016001d960006000f3",
-"0x6001600160016001da60006000f3",
-"0x6001600160016001db60006000f3",
-"0x6001600160016001dc60006000f3",
-"0x6001600160016001dd60006000f3",
-"0x6001600160016001de60006000f3",
-"0x6001600160016001df60006000f3",
-"0x6001600160016001e060006000f3",
-"0x6001600160016001e160006000f3",
-"0x6001600160016001e260006000f3",
-"0x6001600160016001e360006000f3",
-"0x6001600160016001e460006000f3",
-"0x6001600160016001e560006000f3",
-"0x6001600160016001e660006000f3",
-"0x6001600160016001e760006000f3",
-"0x6001600160016001e860006000f3",
-"0x6001600160016001e960006000f3",
-"0x6001600160016001ea60006000f3",
-"0x6001600160016001eb60006000f3",
-"0x6001600160016001ec60006000f3",
-"0x6001600160016001ed60006000f3",
-"0x6001600160016001ee60006000f3",
-"0x6001600160016001ef60006000f3",
-"0x6001600160016001f560006000f3",
-"0x6001600160016001f660006000f3",
-"0x6001600160016001f760006000f3",
-"0x6001600160016001f860006000f3",
-"0x6001600160016001f960006000f3",
-"0x6001600160016001fc60006000f3",
-"0x6001600160016001fe60006000f3"
+"0x600160016001600160016001600160015800006000f3",
+"0x600160016001600160016001600160010c60006000f3",
+"0x600160016001600160016001600160010d60006000f3",
+"0x600160016001600160016001600160010e60006000f3",
+"0x600160016001600160016001600160010f60006000f3",
+"0x600160016001600160016001600160011b60006000f3",
+"0x600160016001600160016001600160011c60006000f3",
+"0x600160016001600160016001600160011d60006000f3",
+"0x600160016001600160016001600160011e60006000f3",
+"0x600160016001600160016001600160011f60006000f3",
+"0x600160016001600160016001600160012160006000f3",
+"0x600160016001600160016001600160012260006000f3",
+"0x600160016001600160016001600160012360006000f3",
+"0x600160016001600160016001600160012460006000f3",
+"0x600160016001600160016001600160012560006000f3",
+"0x600160016001600160016001600160012660006000f3",
+"0x600160016001600160016001600160012760006000f3",
+"0x600160016001600160016001600160012860006000f3",
+"0x600160016001600160016001600160012960006000f3",
+"0x600160016001600160016001600160012a60006000f3",
+"0x600160016001600160016001600160012b60006000f3",
+"0x600160016001600160016001600160012c60006000f3",
+"0x600160016001600160016001600160012d60006000f3",
+"0x600160016001600160016001600160012e60006000f3",
+"0x600160016001600160016001600160012f60006000f3",
+"0x600160016001600160016001600160013f60006000f3",
+"0x600160016001600160016001600160014660006000f3",
+"0x600160016001600160016001600160014760006000f3",
+"0x600160016001600160016001600160014860006000f3",
+"0x600160016001600160016001600160014960006000f3",
+"0x600160016001600160016001600160014a60006000f3",
+"0x600160016001600160016001600160014b60006000f3",
+"0x600160016001600160016001600160014c60006000f3",
+"0x600160016001600160016001600160014d60006000f3",
+"0x600160016001600160016001600160014e60006000f3",
+"0x600160016001600160016001600160014f60006000f3",
+"0x600160016001600160016001600160015c60006000f3",
+"0x600160016001600160016001600160015d60006000f3",
+"0x600160016001600160016001600160015e60006000f3",
+"0x600160016001600160016001600160015f60006000f3",
+"0x60016001600160016001600160016001a560006000f3",
+"0x60016001600160016001600160016001a660006000f3",
+"0x60016001600160016001600160016001a760006000f3",
+"0x60016001600160016001600160016001a860006000f3",
+"0x60016001600160016001600160016001a960006000f3",
+"0x60016001600160016001600160016001aa60006000f3",
+"0x60016001600160016001600160016001ab60006000f3",
+"0x60016001600160016001600160016001ac60006000f3",
+"0x60016001600160016001600160016001ad60006000f3",
+"0x60016001600160016001600160016001ae60006000f3",
+"0x60016001600160016001600160016001af60006000f3",
+"0x60016001600160016001600160016001b060006000f3",
+"0x60016001600160016001600160016001b160006000f3",
+"0x60016001600160016001600160016001b260006000f3",
+"0x60016001600160016001600160016001b360006000f3",
+"0x60016001600160016001600160016001b460006000f3",
+"0x60016001600160016001600160016001b560006000f3",
+"0x60016001600160016001600160016001b660006000f3",
+"0x60016001600160016001600160016001b760006000f3",
+"0x60016001600160016001600160016001b860006000f3",
+"0x60016001600160016001600160016001b960006000f3",
+"0x60016001600160016001600160016001ba60006000f3",
+"0x60016001600160016001600160016001bb60006000f3",
+"0x60016001600160016001600160016001bc60006000f3",
+"0x60016001600160016001600160016001bd60006000f3",
+"0x60016001600160016001600160016001be60006000f3",
+"0x60016001600160016001600160016001bf60006000f3",
+"0x60016001600160016001600160016001c060006000f3",
+"0x60016001600160016001600160016001c160006000f3",
+"0x60016001600160016001600160016001c260006000f3",
+"0x60016001600160016001600160016001c360006000f3",
+"0x60016001600160016001600160016001c460006000f3",
+"0x60016001600160016001600160016001c560006000f3",
+"0x60016001600160016001600160016001c660006000f3",
+"0x60016001600160016001600160016001c760006000f3",
+"0x60016001600160016001600160016001c860006000f3",
+"0x60016001600160016001600160016001c960006000f3",
+"0x60016001600160016001600160016001ca60006000f3",
+"0x60016001600160016001600160016001cb60006000f3",
+"0x60016001600160016001600160016001cc60006000f3",
+"0x60016001600160016001600160016001cd60006000f3",
+"0x60016001600160016001600160016001ce60006000f3",
+"0x60016001600160016001600160016001cf60006000f3",
+"0x60016001600160016001600160016001d060006000f3",
+"0x60016001600160016001600160016001d160006000f3",
+"0x60016001600160016001600160016001d260006000f3",
+"0x60016001600160016001600160016001d360006000f3",
+"0x60016001600160016001600160016001d460006000f3",
+"0x60016001600160016001600160016001d560006000f3",
+"0x60016001600160016001600160016001d660006000f3",
+"0x60016001600160016001600160016001d760006000f3",
+"0x60016001600160016001600160016001d860006000f3",
+"0x60016001600160016001600160016001d960006000f3",
+"0x60016001600160016001600160016001da60006000f3",
+"0x60016001600160016001600160016001db60006000f3",
+"0x60016001600160016001600160016001dc60006000f3",
+"0x60016001600160016001600160016001dd60006000f3",
+"0x60016001600160016001600160016001de60006000f3",
+"0x60016001600160016001600160016001df60006000f3",
+"0x60016001600160016001600160016001e060006000f3",
+"0x60016001600160016001600160016001e160006000f3",
+"0x60016001600160016001600160016001e260006000f3",
+"0x60016001600160016001600160016001e360006000f3",
+"0x60016001600160016001600160016001e460006000f3",
+"0x60016001600160016001600160016001e560006000f3",
+"0x60016001600160016001600160016001e660006000f3",
+"0x60016001600160016001600160016001e760006000f3",
+"0x60016001600160016001600160016001e860006000f3",
+"0x60016001600160016001600160016001e960006000f3",
+"0x60016001600160016001600160016001ea60006000f3",
+"0x60016001600160016001600160016001eb60006000f3",
+"0x60016001600160016001600160016001ec60006000f3",
+"0x60016001600160016001600160016001ed60006000f3",
+"0x60016001600160016001600160016001ee60006000f3",
+"0x60016001600160016001600160016001ef60006000f3",
+"0x60016001600160016001600160016001f560006000f3",
+"0x60016001600160016001600160016001f660006000f3",
+"0x60016001600160016001600160016001f760006000f3",
+"0x60016001600160016001600160016001f860006000f3",
+"0x60016001600160016001600160016001f960006000f3",
+"0x60016001600160016001600160016001fc60006000f3",
+"0x60016001600160016001600160016001fe60006000f3"
             ],
             "gasLimit" : [
                 "400000"
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodeDynamicCodeFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodeDynamicCodeFiller.json
index 2e93ac60d..7f09c9ded 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodeDynamicCodeFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodeDynamicCodeFiller.json
@@ -57,11 +57,11 @@
         "pre" : {
             "1000000000000000000000000000000000000000" : {
                 "balance" : "10000",
-		"//comment1" : "{ (MSTORE 0 0x600160005533601455) (RETURN 23 9) }",
+                "//comment1" : "{ (MSTORE 0 0x600160005533601455) (RETURN 23 9) }",
                 "//comment2" : "{ (MSTORE 0 0x6860016000553360145560005260096017f3) [[ 10 ]] (CREATE 1 14 18) [[ 11 ]] (CALLCODE 100000 0xffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6 0 0 64 0 64 ) }",	
-		"//comment3" : "0x716860016000553360145560005260096017f36000526012600e6001f0600a55604060006040600060007313136008b64ff592819b2fa6d43f2835c452020e620186a0f2600b55",
-		"//comment4" : "            0x0102030405060708091011121314151617181920212223242526272829303132             0x0102030405060708091011121314151617181920212223242526272829303132",
-		"code" : "{ (MSTORE 0 0x716860016000553360145560005260096017f36000526012600e6001f0600a55) (MSTORE 32 0x6040600060406000600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b662)     (MSTORE 64 0x0186a0f2600b5500000000000000000000000000000000000000000000000000) (CREATE 1 0 96) }",
+                "//comment3" : "0x716860016000553360145560005260096017f36000526012600e6001f0600a55604060006040600060007313136008b64ff592819b2fa6d43f2835c452020e620186a0f2600b55",
+                "//comment4" : "            0x0102030405060708091011121314151617181920212223242526272829303132             0x0102030405060708091011121314151617181920212223242526272829303132",
+                "code" : "{ (MSTORE 0 0x716860016000553360145560005260096017f36000526012600e6001f0600a55) (MSTORE 32 0x6040600060406000600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b662)     (MSTORE 64 0x0186a0f2600b5500000000000000000000000000000000000000000000000000) (CREATE 1 0 96) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToExistingContractFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToExistingContractFiller.json
index 8347ac549..511326a72 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToExistingContractFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodeInInitcodeToExistingContractFiller.json
@@ -31,7 +31,7 @@
             "1000000000000000000000000000000000000000" : {
                 "balance" : "10000",
                 "code" : "{ (MSTORE 0 0x6040600060406000600073945304eb96065b2a98b57a48a06ae28d285a71b562) (MSTORE 32 0x0186a0f260005500000000000000000000000000000000000000000000000000) (CREATE 1 0 64) }",
-                "code2" : "{ (MSTORE 0 0x6001600155600260025560036003556004600455600560055560066006556007) (MSTORE 32 0x60075560086008556009600955600a600a550000000000000000000000000000) (CREATE 1 0 64) }",
+                "//code2" : "{ (MSTORE 0 0x6001600155600260025560036003556004600455600560055560066006556007) (MSTORE 32 0x60075560086008556009600955600a600a550000000000000000000000000000) (CREATE 1 0 64) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stCreateTest/CreateCollisionToEmptyFiller.json b/src/GeneralStateTestsFiller/stCreateTest/CreateCollisionToEmptyFiller.json
index b50c1abde..98496a06f 100644
--- a/src/GeneralStateTestsFiller/stCreateTest/CreateCollisionToEmptyFiller.json
+++ b/src/GeneralStateTestsFiller/stCreateTest/CreateCollisionToEmptyFiller.json
@@ -1,6 +1,6 @@
 {
     "CreateCollisionToEmpty" : {
-	 "_info" : {
+        "_info" : {
             "comment" : "data0 - create collision to empty, data1 - to empty but nonce, data2 - to contract with code"
         },
         "env" : {
diff --git a/src/GeneralStateTestsFiller/stEIP158Specific/EXP_EmptyFiller.json b/src/GeneralStateTestsFiller/stEIP158Specific/EXP_EmptyFiller.json
index a3d8b4560..2bbd6986a 100644
--- a/src/GeneralStateTestsFiller/stEIP158Specific/EXP_EmptyFiller.json
+++ b/src/GeneralStateTestsFiller/stEIP158Specific/EXP_EmptyFiller.json
@@ -17,24 +17,24 @@
                 },
                 "network" : ["EIP158"],
                 "result" : {
-		    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-			"comment" : "https://etherpad.net/p/EIP158",
-		        "storage" : {
-		            "0x00" : "0x08d5b6",
-		            "0x02" : "0x0873c4",
-		            "0x03" : "0x01",
-		            "0x04" : "0x07d76c",
-		            "0x06" : "0x07741c",
-		            "0x08" : "0x070f3c",
-		            "0x0a" : "0x06a73c",
-		            "0x0b" : "0x01",
-		            "0x0c" : "0x060ae4",
-		            "0x0d" : "0x01",
-		            "0x0e" : "0x056e8c",
-		            "0x0f" : "0x01",
-		            "0x64" : "0x04d234"
-		        }
-		    }
+                "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                    "//comment" : "https://etherpad.net/p/EIP158",
+                    "storage" : {
+                        "0x00" : "0x08d5b6",
+                        "0x02" : "0x0873c4",
+                        "0x03" : "0x01",
+                        "0x04" : "0x07d76c",
+                        "0x06" : "0x07741c",
+                        "0x08" : "0x070f3c",
+                        "0x0a" : "0x06a73c",
+                        "0x0b" : "0x01",
+                        "0x0c" : "0x060ae4",
+                        "0x0d" : "0x01",
+                        "0x0e" : "0x056e8c",
+                        "0x0f" : "0x01",
+                        "0x64" : "0x04d234"
+                    }
+                }
                 }
             },
 	    {
@@ -45,24 +45,24 @@
                 },
                 "network" : ["EIP150"],
                 "result" : {
-		    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-			"comment" : "https://etherpad.net/p/EIP158",
-		        "storage" : {
-		            "0x00" : "0x08d5b6",
-		            "0x02" : "0x0873ec",
-		            "0x03" : "0x01",
-		            "0x04" : "0x07d794",
-		            "0x06" : "0x077584",
-		            "0x08" : "0x071324",
-		            "0x0a" : "0x06b024",
-		            "0x0b" : "0x01",
-		            "0x0c" : "0x0613cc",
-		            "0x0d" : "0x01",
-		            "0x0e" : "0x057774",
-		            "0x0f" : "0x01",
-		            "0x64" : "0x04db1c"
-		        }
-		    }
+                "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                    "//comment" : "https://etherpad.net/p/EIP158",
+                    "storage" : {
+                        "0x00" : "0x08d5b6",
+                        "0x02" : "0x0873ec",
+                        "0x03" : "0x01",
+                        "0x04" : "0x07d794",
+                        "0x06" : "0x077584",
+                        "0x08" : "0x071324",
+                        "0x0a" : "0x06b024",
+                        "0x0b" : "0x01",
+                        "0x0c" : "0x0613cc",
+                        "0x0d" : "0x01",
+                        "0x0e" : "0x057774",
+                        "0x0f" : "0x01",
+                        "0x64" : "0x04db1c"
+                    }
+                }
                 }
             },
 	    {
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexpFiller.json b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexpFiller.json
index 4c6fb07c1..f4a227da6 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexpFiller.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts/modexpFiller.json
@@ -280,7 +280,8 @@
 		"28 - base length 4TiB",
 		"29 - exp length 4TiB; returns 0 because mod is zero",
 		"30 - base and mod have zero-length.  exp's length is 2^255.  Since mod is zero, the result should be zero.",
-		"31,32,33,34,35 - something that should result in 1."
+		"31,32,33,34,35 - something that should result in 1.",
+		"36 - the input found on 10 Oct. 2017 that overflows the gas calculation"
 	    ],
             "data" : [
                 "0x00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
@@ -318,7 +319,8 @@
 "0x0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000cd935b43e42204fcbfb734a6e27735e8e90204fcc1fd2727bb040f9eecb",
 "0x0000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000060846813a8d2d451387340fa0597c6545ae63",
 "0x0000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000d02534f82b1013f20d9c7d18d62cd95674d2e013f20d9c7d18d62cd95674d2f",
-"0x0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d"
+"0x0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000120785e45de3d6be050ba3c4d33ff0bb2d010ace3b1dfe9c49f4c7a8075102fa19a86c010ace3b1dfe9c49f4c7a8075102fa19a86d",
+"0x00000000000000000000000000000000000000000000000000000000000000ff2a1e5300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
             ],
             "gasLimit" : [
                 "100000000", "90000", "110000", "200000"
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover0Filler.json
index 7136455a2..7136455a2 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover0_0inputFiller.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover0_0inputFiller.json
index 7e2fbaab9..7e2fbaab9 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover0_0inputFiller.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover0_0inputFiller.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover0_Gas2999Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover0_Gas2999Filler.json
index 30ad405a2..30ad405a2 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover0_Gas2999Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover0_Gas2999Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover0_NoGasFiller.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover0_NoGasFiller.json
index 91d09fe62..91d09fe62 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover0_NoGasFiller.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover0_NoGasFiller.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover0_completeReturnValueFiller.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover0_completeReturnValueFiller.json
index 708250e99..708250e99 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover0_completeReturnValueFiller.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover0_completeReturnValueFiller.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover0_gas3000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover0_gas3000Filler.json
index db73a6ca3..db73a6ca3 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover0_gas3000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover0_gas3000Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover0_overlappingInputOutputFiller.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover0_overlappingInputOutputFiller.json
index c0873b2d8..c0873b2d8 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover0_overlappingInputOutputFiller.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover0_overlappingInputOutputFiller.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover1Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover1Filler.json
index db3ca08f0..db3ca08f0 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover1Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover1Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover2Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover2Filler.json
index a011a6df1..a011a6df1 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover2Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover2Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover3Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover3Filler.json
index 0bff7880e..0bff7880e 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover3Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover3Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover80Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover80Filler.json
index a1e9905bf..a1e9905bf 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecover80Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecover80Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecoverH_prefixed0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecoverH_prefixed0Filler.json
index 43f7d149b..43f7d149b 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecoverH_prefixed0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecoverH_prefixed0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecoverR_prefixed0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecoverR_prefixed0Filler.json
index 273810a2c..273810a2c 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecoverR_prefixed0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecoverR_prefixed0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecoverS_prefixed0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecoverS_prefixed0Filler.json
index 9ee916a0a..9ee916a0a 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecoverS_prefixed0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecoverS_prefixed0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecoverV_prefixed0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecoverV_prefixed0Filler.json
index 817074da9..817074da9 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecoverV_prefixed0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecoverV_prefixed0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecoverV_prefixedf0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecoverV_prefixedf0Filler.json
index 5d5a6cd87..5d5a6cd87 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEEcrecoverV_prefixedf0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEEcrecoverV_prefixedf0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentitiy_0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEIdentitiy_0Filler.json
index 47f3c139c..47f3c139c 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentitiy_0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEIdentitiy_0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentitiy_1Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEIdentitiy_1Filler.json
index aee2484dc..aee2484dc 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentitiy_1Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEIdentitiy_1Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentity_1_nonzeroValueFiller.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEIdentity_1_nonzeroValueFiller.json
index e9f86fd2b..e9f86fd2b 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentity_1_nonzeroValueFiller.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEIdentity_1_nonzeroValueFiller.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentity_2Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEIdentity_2Filler.json
index f33e4dbe8..f33e4dbe8 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentity_2Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEIdentity_2Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentity_3Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEIdentity_3Filler.json
index 76e96cb21..76e96cb21 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentity_3Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEIdentity_3Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentity_4Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEIdentity_4Filler.json
index 1e4391a03..1e4391a03 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentity_4Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEIdentity_4Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentity_4_gas17Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEIdentity_4_gas17Filler.json
index b9451cf17..b9451cf17 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentity_4_gas17Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEIdentity_4_gas17Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentity_4_gas18Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEIdentity_4_gas18Filler.json
index f4ae482ef..f4ae482ef 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentity_4_gas18Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEIdentity_4_gas18Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentity_5Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEIdentity_5Filler.json
index 0dd51174e..0dd51174e 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODEIdentity_5Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODEIdentity_5Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODERipemd160_0Filler.json
index f410e41a6..f410e41a6 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODERipemd160_0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_1Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODERipemd160_1Filler.json
index 501614e59..501614e59 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_1Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODERipemd160_1Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_2Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODERipemd160_2Filler.json
index 0ffc2ddc0..0ffc2ddc0 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_2Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODERipemd160_2Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_3Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODERipemd160_3Filler.json
index c0c4a3408..c0c4a3408 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_3Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODERipemd160_3Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_3_postfixed0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODERipemd160_3_postfixed0Filler.json
index 53a43e180..53a43e180 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_3_postfixed0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODERipemd160_3_postfixed0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_3_prefixed0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODERipemd160_3_prefixed0Filler.json
index 887a55eec..887a55eec 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_3_prefixed0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODERipemd160_3_prefixed0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_4Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODERipemd160_4Filler.json
index 8a292fdc3..8a292fdc3 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_4Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODERipemd160_4Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_4_gas719Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODERipemd160_4_gas719Filler.json
index c680a70a9..c680a70a9 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_4_gas719Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODERipemd160_4_gas719Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_5Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODERipemd160_5Filler.json
index f54bb91ed..f54bb91ed 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODERipemd160_5Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODERipemd160_5Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_0Filler.json
index 296dd2843..296dd2843 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_1Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_1Filler.json
index 1eb97d8c5..1eb97d8c5 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_1Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_1Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_1_nonzeroValueFiller.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_1_nonzeroValueFiller.json
index f6468ff1d..f6468ff1d 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_1_nonzeroValueFiller.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_1_nonzeroValueFiller.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_2Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_2Filler.json
index 266f060d3..266f060d3 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_2Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_2Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_3Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_3Filler.json
index 499210a00..499210a00 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_3Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_3Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_3_postfix0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_3_postfix0Filler.json
index 4aabd2aee..4aabd2aee 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_3_postfix0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_3_postfix0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_3_prefix0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_3_prefix0Filler.json
index d35a6caf6..d35a6caf6 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_3_prefix0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_3_prefix0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_4Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_4Filler.json
index 7b06d9cb5..7b06d9cb5 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_4Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_4Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_4_gas99Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_4_gas99Filler.json
index 48ba78555..48ba78555 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_4_gas99Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_4_gas99Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_5Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_5Filler.json
index e9cda7ae9..e9cda7ae9 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CALLCODESha256_5Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CALLCODESha256_5Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover0Filler.json
index bd7894d31..bd7894d31 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover0_0inputFiller.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover0_0inputFiller.json
index 045388b8e..045388b8e 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover0_0inputFiller.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover0_0inputFiller.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover0_Gas2999Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover0_Gas2999Filler.json
index c01460855..c01460855 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover0_Gas2999Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover0_Gas2999Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover0_NoGasFiller.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover0_NoGasFiller.json
index 7216cd270..7216cd270 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover0_NoGasFiller.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover0_NoGasFiller.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover0_completeReturnValueFiller.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover0_completeReturnValueFiller.json
index 3d1165f71..3d1165f71 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover0_completeReturnValueFiller.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover0_completeReturnValueFiller.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover0_gas3000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover0_gas3000Filler.json
index 0bf2e9fa8..0bf2e9fa8 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover0_gas3000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover0_gas3000Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover0_overlappingInputOutputFiller.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover0_overlappingInputOutputFiller.json
index 41aa4e9da..41aa4e9da 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover0_overlappingInputOutputFiller.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover0_overlappingInputOutputFiller.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover1Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover1Filler.json
index f37851a92..f37851a92 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover1Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover1Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover2Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover2Filler.json
index 41ff8a91a..41ff8a91a 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover2Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover2Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover3Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover3Filler.json
index 28c014950..28c014950 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover3Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover3Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover80Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover80Filler.json
index 55e3d3f89..55e3d3f89 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecover80Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecover80Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverCheckLengthFiller.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecoverCheckLengthFiller.json
index 207efd046..207efd046 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverCheckLengthFiller.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecoverCheckLengthFiller.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverCheckLengthWrongVFiller.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecoverCheckLengthWrongVFiller.json
index 969c6d178..969c6d178 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverCheckLengthWrongVFiller.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecoverCheckLengthWrongVFiller.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverH_prefixed0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecoverH_prefixed0Filler.json
index b7658fa67..b7658fa67 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverH_prefixed0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecoverH_prefixed0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverR_prefixed0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecoverR_prefixed0Filler.json
index c48798e71..c48798e71 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverR_prefixed0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecoverR_prefixed0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverS_prefixed0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecoverS_prefixed0Filler.json
index 47208abfa..47208abfa 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverS_prefixed0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecoverS_prefixed0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverV_prefixed0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecoverV_prefixed0Filler.json
index 80b567602..80b567602 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallEcrecoverV_prefixed0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallEcrecoverV_prefixed0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentitiy_0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallIdentitiy_0Filler.json
index bf79da3f2..bf79da3f2 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentitiy_0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallIdentitiy_0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentitiy_1Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallIdentitiy_1Filler.json
index a25ddb3db..a25ddb3db 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentitiy_1Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallIdentitiy_1Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentity_1_nonzeroValueFiller.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallIdentity_1_nonzeroValueFiller.json
index ed72b1cdf..ed72b1cdf 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentity_1_nonzeroValueFiller.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallIdentity_1_nonzeroValueFiller.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentity_2Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallIdentity_2Filler.json
index 9a055cc9c..9a055cc9c 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentity_2Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallIdentity_2Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentity_3Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallIdentity_3Filler.json
index e40e05d3b..e40e05d3b 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentity_3Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallIdentity_3Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentity_4Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallIdentity_4Filler.json
index d85670220..d85670220 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentity_4Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallIdentity_4Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentity_4_gas17Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallIdentity_4_gas17Filler.json
index c6b9f1765..c6b9f1765 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentity_4_gas17Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallIdentity_4_gas17Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentity_4_gas18Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallIdentity_4_gas18Filler.json
index 4c5574853..4c5574853 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentity_4_gas18Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallIdentity_4_gas18Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentity_5Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallIdentity_5Filler.json
index 2da071597..2da071597 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallIdentity_5Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallIdentity_5Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallRipemd160_0Filler.json
index ace3c43fa..ace3c43fa 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallRipemd160_0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_1Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallRipemd160_1Filler.json
index 33c2e23cd..33c2e23cd 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_1Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallRipemd160_1Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_2Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallRipemd160_2Filler.json
index f71847c9d..f71847c9d 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_2Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallRipemd160_2Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_3Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallRipemd160_3Filler.json
index c22baf08f..c22baf08f 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_3Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallRipemd160_3Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_3_postfixed0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallRipemd160_3_postfixed0Filler.json
index d23539204..d23539204 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_3_postfixed0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallRipemd160_3_postfixed0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_3_prefixed0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallRipemd160_3_prefixed0Filler.json
index 16f8dea23..16f8dea23 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_3_prefixed0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallRipemd160_3_prefixed0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_4Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallRipemd160_4Filler.json
index c34093ad0..c34093ad0 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_4Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallRipemd160_4Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_4_gas719Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallRipemd160_4_gas719Filler.json
index 4e5978ce1..4e5978ce1 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_4_gas719Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallRipemd160_4_gas719Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_5Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallRipemd160_5Filler.json
index d8ff9d8ed..d8ff9d8ed 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallRipemd160_5Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallRipemd160_5Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_0Filler.json
index 41eb75167..41eb75167 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_1Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_1Filler.json
index 03335c6ec..03335c6ec 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_1Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_1Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_1_nonzeroValueFiller.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_1_nonzeroValueFiller.json
index adb320629..adb320629 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_1_nonzeroValueFiller.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_1_nonzeroValueFiller.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_2Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_2Filler.json
index d0421c90c..d0421c90c 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_2Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_2Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_3Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_3Filler.json
index c5c397bf6..c5c397bf6 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_3Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_3Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_3_postfix0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_3_postfix0Filler.json
index 2f48bfa12..2f48bfa12 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_3_postfix0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_3_postfix0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_3_prefix0Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_3_prefix0Filler.json
index 59f66adcc..59f66adcc 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_3_prefix0Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_3_prefix0Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_4Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_4Filler.json
index f14994040..f14994040 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_4Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_4Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_4_gas99Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_4_gas99Filler.json
index b3ceb81d6..b3ceb81d6 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_4_gas99Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_4_gas99Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_5Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_5Filler.json
index c1dc83b27..c1dc83b27 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/CallSha256_5Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/CallSha256_5Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts2/modexpRandomInputFiller.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/modexpRandomInputFiller.json
new file mode 100644
index 000000000..bc6f3057a
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/modexpRandomInputFiller.json
@@ -0,0 +1,82 @@
+{
+    "modexpRandomInput": {
+	"_info" : {
+	    "comment" : "Fuzzed input discovered by Guido"
+	},
+        "env": {
+            "currentCoinbase": "0x3535353535353535353535353535353535353535",
+            "currentDifficulty": "0x020000",
+            "currentGasLimit": "0x5f5e100",
+            "currentNumber": "0x1",
+            "currentTimestamp": "1000",
+            "previousHash": "0xc6745cf3cada515bbfb9573261c82547e0b8f9e3d5dd382e464704a84e47b5ad"
+        },
+        "expect": [
+            {
+                "indexes" : {
+                    "data" : 0,
+                    "gas" : 0,
+                    "value" : -1
+                },
+                "network" : ["Byzantium"],
+                "result" : {
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "999999999999999977128"
+                    }
+                }
+            },
+	         {
+                "indexes" : {
+                    "data" : 1,
+                    "gas" : 0,
+                    "value" : -1
+                },
+                "network" : ["Byzantium"],
+                "result" : {
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "999999999999999290000"
+                    }
+                }
+            },
+	         {
+                "indexes" : {
+                    "data" : 2,
+                    "gas" : 1,
+                    "value" : -1
+                },
+                "network" : ["Byzantium"],
+                "result" : {
+                    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "999999999999993000000"
+                    }
+                }
+            }
+        ],
+        "pre": {
+	    "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "1000000000000000000000",
+                "code" : "",
+                "nonce" : "0",
+                "storage" : {
+                }
+            }
+        },
+        "transaction": {
+            "data": [
+"0x00000000000000000000000000000000000000000000000000000000000000e300000000000000000000000000000000000000000000000000",
+"0x00000000008000000000000000000000000000000000000000000000000000000000000400000000000000000000000a",
+"0x0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001147000000000000000000000000000000000000000000000000000000000061660350000000000000000000000000000000000000000000000000000000000000008"
+            ],
+            "gasLimit": [
+                "710000", "7000000"
+            ],
+            "gasPrice": "1",
+            "nonce": "0",
+            "secretKey": "45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+	         "to": "0x0000000000000000000000000000000000000005",
+            "value": [
+                "0x"
+            ]
+        }
+    }
+}
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_20500Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/modexp_0_0_0_20500Filler.json
index d2670426d..d2670426d 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_20500Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/modexp_0_0_0_20500Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_22000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/modexp_0_0_0_22000Filler.json
index a11ab17b0..a11ab17b0 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_22000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/modexp_0_0_0_22000Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_25000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/modexp_0_0_0_25000Filler.json
index 2b783669f..2b783669f 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_25000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/modexp_0_0_0_25000Filler.json
diff --git a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_35000Filler.json b/src/GeneralStateTestsFiller/stPreCompiledContracts2/modexp_0_0_0_35000Filler.json
index 8bab8127c..8bab8127c 100644
--- a/src/GeneralStateTestsFiller/stPreCompiledContracts/modexp_0_0_0_35000Filler.json
+++ b/src/GeneralStateTestsFiller/stPreCompiledContracts2/modexp_0_0_0_35000Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest384Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest384Filler.json
index 401b6b424..401b6b424 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest384Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest384Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest385Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest385Filler.json
index 232177fa0..232177fa0 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest385Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest385Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest386Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest386Filler.json
index a9f8eb972..a9f8eb972 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest386Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest386Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest387Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest387Filler.json
index feea1931b..feea1931b 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest387Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest387Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest388Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest388Filler.json
index bea4abc6e..bea4abc6e 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest388Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest388Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest389Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest389Filler.json
index 4e6ec1cbb..4e6ec1cbb 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest389Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest389Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest391Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest391Filler.json
index e69d0ee95..e69d0ee95 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest391Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest391Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest393Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest393Filler.json
index 5ad4de27f..5ad4de27f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest393Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest393Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest395Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest395Filler.json
index 902223d78..902223d78 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest395Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest395Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest396Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest396Filler.json
index 48d3c112f..48d3c112f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest396Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest396Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest397Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest397Filler.json
index 404d7f8ee..404d7f8ee 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest397Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest397Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest398Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest398Filler.json
index c953b751f..c953b751f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest398Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest398Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest399Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest399Filler.json
index 7ebbdbdde..7ebbdbdde 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest399Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest399Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest401Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest401Filler.json
index aca275cc5..aca275cc5 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest401Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest401Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest402Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest402Filler.json
index 21d50e2a5..21d50e2a5 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest402Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest402Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest404Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest404Filler.json
index ca8213c16..ca8213c16 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest404Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest404Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest405Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest405Filler.json
index a46b86253..a46b86253 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest405Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest405Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest406Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest406Filler.json
index 2e09a51b9..2e09a51b9 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest406Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest406Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest407Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest407Filler.json
index fc5e33de5..fc5e33de5 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest407Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest407Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest408Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest408Filler.json
index 11faf389c..11faf389c 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest408Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest408Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest409Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest409Filler.json
index 7dc2f18e1..7dc2f18e1 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest409Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest409Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest410Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest410Filler.json
index fc0c904aa..fc0c904aa 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest410Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest410Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest411Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest411Filler.json
index af2c1a8bc..af2c1a8bc 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest411Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest411Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest412Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest412Filler.json
index 6dc4d9a66..6dc4d9a66 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest412Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest412Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest413Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest413Filler.json
index 77cda38af..77cda38af 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest413Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest413Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest414Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest414Filler.json
index 768e73c5f..768e73c5f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest414Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest414Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest415Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest415Filler.json
index 78819cfe5..78819cfe5 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest415Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest415Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest416Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest416Filler.json
index 6e19e82f5..6e19e82f5 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest416Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest416Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest417Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest417Filler.json
index 29667a646..29667a646 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest417Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest417Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest418Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest418Filler.json
index 8dc903456..8dc903456 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest418Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest418Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest419Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest419Filler.json
index 2ec3a4a81..2ec3a4a81 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest419Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest419Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest420Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest420Filler.json
index 175a89c84..175a89c84 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest420Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest420Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest421Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest421Filler.json
index fc3323cf7..fc3323cf7 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest421Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest421Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest422Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest422Filler.json
index eb827b0c3..eb827b0c3 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest422Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest422Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest423Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest423Filler.json
index aa9050887..aa9050887 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest423Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest423Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest424Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest424Filler.json
index c8f2c6b72..c8f2c6b72 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest424Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest424Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest425Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest425Filler.json
index 0a5d927e2..0a5d927e2 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest425Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest425Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest426Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest426Filler.json
index 736778116..736778116 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest426Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest426Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest428Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest428Filler.json
index ba58282a1..ba58282a1 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest428Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest428Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest429Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest429Filler.json
index 982f38138..982f38138 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest429Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest429Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest430Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest430Filler.json
index 617cdc014..617cdc014 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest430Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest430Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest433Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest433Filler.json
index f470c1d0e..f470c1d0e 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest433Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest433Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest435Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest435Filler.json
index 2d721368e..2d721368e 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest435Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest435Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest436Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest436Filler.json
index 1a8cde4fa..1a8cde4fa 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest436Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest436Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest437Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest437Filler.json
index 9ed83f97f..9ed83f97f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest437Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest437Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest438Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest438Filler.json
index c323e20de..c323e20de 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest438Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest438Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest439Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest439Filler.json
index 4a8222233..4a8222233 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest439Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest439Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest440Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest440Filler.json
index 2a1ce3591..2a1ce3591 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest440Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest440Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest441Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest441Filler.json
index 216cb8137..216cb8137 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest441Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest441Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest442Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest442Filler.json
index 024900278..024900278 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest442Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest442Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest443Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest443Filler.json
index e0965e269..e0965e269 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest443Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest443Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest444Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest444Filler.json
index b26e5db15..b26e5db15 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest444Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest444Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest445Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest445Filler.json
index 998b20d3b..998b20d3b 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest445Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest445Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest446Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest446Filler.json
index 2d42090d6..2d42090d6 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest446Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest446Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest447Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest447Filler.json
index ee583b35b..ee583b35b 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest447Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest447Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest448Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest448Filler.json
index 1a39335c9..1a39335c9 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest448Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest448Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest449Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest449Filler.json
index b392bc6bc..b392bc6bc 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest449Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest449Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest450Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest450Filler.json
index 0ef4455ad..0ef4455ad 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest450Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest450Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest451Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest451Filler.json
index aaf9b2ec0..aaf9b2ec0 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest451Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest451Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest452Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest452Filler.json
index b321656da..b321656da 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest452Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest452Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest454Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest454Filler.json
index 0f7be34eb..0f7be34eb 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest454Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest454Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest455Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest455Filler.json
index 97bbe4dfb..97bbe4dfb 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest455Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest455Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest456Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest456Filler.json
index ff8177fda..ff8177fda 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest456Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest456Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest457Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest457Filler.json
index e211aec22..e211aec22 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest457Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest457Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest458Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest458Filler.json
index 671c22a75..671c22a75 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest458Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest458Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest460Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest460Filler.json
index 2e5c73786..2e5c73786 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest460Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest460Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest461Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest461Filler.json
index 6c79dcaee..6c79dcaee 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest461Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest461Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest462Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest462Filler.json
index cc21a2f04..cc21a2f04 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest462Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest462Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest464Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest464Filler.json
index 294421414..294421414 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest464Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest464Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest465Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest465Filler.json
index 5ae851a35..5ae851a35 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest465Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest465Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest466Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest466Filler.json
index 40de4db02..40de4db02 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest466Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest466Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest467Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest467Filler.json
index 7e1c127f7..7e1c127f7 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest467Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest467Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest468Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest468Filler.json
index 10a5a7be9..10a5a7be9 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest468Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest468Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest469Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest469Filler.json
index a9af46b29..a9af46b29 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest469Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest469Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest470Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest470Filler.json
index b129d0ff9..b129d0ff9 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest470Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest470Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest471Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest471Filler.json
index 008dfe6bb..008dfe6bb 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest471Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest471Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest472Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest472Filler.json
index 6fa8bf422..6fa8bf422 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest472Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest472Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest473Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest473Filler.json
index 25d06ed4e..25d06ed4e 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest473Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest473Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest474Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest474Filler.json
index 2ca69f6d6..2ca69f6d6 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest474Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest474Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest475Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest475Filler.json
index 4c34a92ad..4c34a92ad 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest475Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest475Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest476Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest476Filler.json
index 910780b16..910780b16 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest476Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest476Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest477Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest477Filler.json
index b541d5846..b541d5846 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest477Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest477Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest478Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest478Filler.json
index 785d40443..785d40443 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest478Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest478Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest480Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest480Filler.json
index 223086d3f..223086d3f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest480Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest480Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest481Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest481Filler.json
index e120720e3..e120720e3 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest481Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest481Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest482Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest482Filler.json
index 1fde33c23..1fde33c23 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest482Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest482Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest483Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest483Filler.json
index 35de82ec9..35de82ec9 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest483Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest483Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest484Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest484Filler.json
index dc0038b85..dc0038b85 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest484Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest484Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest485Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest485Filler.json
index 42715b544..42715b544 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest485Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest485Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest487Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest487Filler.json
index 08d7a2b1d..08d7a2b1d 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest487Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest487Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest488Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest488Filler.json
index 32380a28a..32380a28a 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest488Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest488Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest489Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest489Filler.json
index a484aab76..a484aab76 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest489Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest489Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest491Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest491Filler.json
index 7253afebd..7253afebd 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest491Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest491Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest493Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest493Filler.json
index 67be31cbe..67be31cbe 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest493Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest493Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest494Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest494Filler.json
index 9a8f63276..9a8f63276 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest494Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest494Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest495Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest495Filler.json
index 79826f5f8..79826f5f8 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest495Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest495Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest496Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest496Filler.json
index b571d3ee2..b571d3ee2 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest496Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest496Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest497Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest497Filler.json
index e046d6d35..e046d6d35 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest497Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest497Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest498Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest498Filler.json
index a988f8df2..a988f8df2 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest498Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest498Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest499Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest499Filler.json
index bf0c09f1c..bf0c09f1c 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest499Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest499Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest500Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest500Filler.json
index 941c9a48b..941c9a48b 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest500Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest500Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest501Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest501Filler.json
index ff3506e7f..ff3506e7f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest501Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest501Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest502Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest502Filler.json
index 85f5f0c2f..85f5f0c2f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest502Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest502Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest503Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest503Filler.json
index 76e144354..76e144354 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest503Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest503Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest504Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest504Filler.json
index 82c2d0de3..82c2d0de3 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest504Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest504Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest505Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest505Filler.json
index 3cb1d6eea..3cb1d6eea 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest505Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest505Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest506Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest506Filler.json
index e6610024e..e6610024e 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest506Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest506Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest507Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest507Filler.json
index f99cbd50f..f99cbd50f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest507Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest507Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest508Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest508Filler.json
index 8514ac09f..8514ac09f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest508Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest508Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest509Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest509Filler.json
index da792d866..da792d866 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest509Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest509Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest510Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest510Filler.json
index 2a2588941..2a2588941 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest510Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest510Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest511Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest511Filler.json
index d8be66d44..d8be66d44 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest511Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest511Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest512Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest512Filler.json
index 41d396721..41d396721 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest512Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest512Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest513Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest513Filler.json
index 808c4fbae..808c4fbae 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest513Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest513Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest514Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest514Filler.json
index 09a6bd444..09a6bd444 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest514Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest514Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest516Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest516Filler.json
index 4435f8478..4435f8478 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest516Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest516Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest517Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest517Filler.json
index b8435601d..b8435601d 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest517Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest517Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest518Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest518Filler.json
index 4cb72be6d..4cb72be6d 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest518Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest518Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest519Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest519Filler.json
index 8932c4bc3..8932c4bc3 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest519Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest519Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest520Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest520Filler.json
index 18bfc2021..18bfc2021 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest520Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest520Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest521Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest521Filler.json
index 1959f7853..1959f7853 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest521Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest521Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest523Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest523Filler.json
index 43d1b311e..43d1b311e 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest523Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest523Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest524Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest524Filler.json
index b8af171f0..b8af171f0 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest524Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest524Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest525Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest525Filler.json
index 773fcd932..773fcd932 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest525Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest525Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest526Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest526Filler.json
index 3947e4df4..3947e4df4 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest526Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest526Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest527Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest527Filler.json
index e8e6f70b1..e8e6f70b1 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest527Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest527Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest528Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest528Filler.json
index 3f3d3b281..3f3d3b281 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest528Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest528Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest531Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest531Filler.json
index a05a28132..a05a28132 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest531Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest531Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest532Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest532Filler.json
index 398f9de27..398f9de27 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest532Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest532Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest533Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest533Filler.json
index fbda16511..fbda16511 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest533Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest533Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest534Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest534Filler.json
index 14317d6ec..14317d6ec 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest534Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest534Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest535Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest535Filler.json
index 8575fe049..8575fe049 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest535Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest535Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest536Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest536Filler.json
index a16fc5aa6..a16fc5aa6 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest536Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest536Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest537Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest537Filler.json
index dd7644000..dd7644000 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest537Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest537Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest538Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest538Filler.json
index 8803cb19f..8803cb19f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest538Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest538Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest539Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest539Filler.json
index 8e9d345d9..8e9d345d9 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest539Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest539Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest541Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest541Filler.json
index ca615c974..ca615c974 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest541Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest541Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest542Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest542Filler.json
index 0045cac3c..0045cac3c 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest542Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest542Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest543Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest543Filler.json
index dc2293655..dc2293655 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest543Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest543Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest544Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest544Filler.json
index 585b5c672..585b5c672 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest544Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest544Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest545Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest545Filler.json
index 150235188..150235188 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest545Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest545Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest546Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest546Filler.json
index f344c6a78..f344c6a78 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest546Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest546Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest547Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest547Filler.json
index 5a241e518..5a241e518 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest547Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest547Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest548Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest548Filler.json
index 492471b94..492471b94 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest548Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest548Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest549Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest549Filler.json
index 21197ca85..21197ca85 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest549Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest549Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest550Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest550Filler.json
index 3bca50981..3bca50981 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest550Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest550Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest552Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest552Filler.json
index 29ee20ae1..29ee20ae1 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest552Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest552Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest553Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest553Filler.json
index 7430dabb7..7430dabb7 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest553Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest553Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest554Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest554Filler.json
index 75e3dc3e1..75e3dc3e1 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest554Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest554Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest555Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest555Filler.json
index 3575de2f5..3575de2f5 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest555Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest555Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest556Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest556Filler.json
index 1efacd699..1efacd699 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest556Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest556Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest558Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest558Filler.json
index 7b1090378..7b1090378 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest558Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest558Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest559Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest559Filler.json
index 43178dab9..43178dab9 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest559Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest559Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest560Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest560Filler.json
index b7be035d4..b7be035d4 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest560Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest560Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest562Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest562Filler.json
index 2e685e14a..2e685e14a 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest562Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest562Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest563Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest563Filler.json
index 023dd14a8..023dd14a8 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest563Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest563Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest564Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest564Filler.json
index e18ff9166..e18ff9166 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest564Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest564Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest565Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest565Filler.json
index a9a267575..a9a267575 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest565Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest565Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest566Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest566Filler.json
index fc4336ae8..fc4336ae8 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest566Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest566Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest567Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest567Filler.json
index adafc93d6..adafc93d6 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest567Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest567Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest569Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest569Filler.json
index 171d4ce22..171d4ce22 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest569Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest569Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest571Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest571Filler.json
index 50be61eba..50be61eba 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest571Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest571Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest572Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest572Filler.json
index 867cee653..867cee653 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest572Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest572Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest573Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest573Filler.json
index 1fa2408a5..1fa2408a5 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest573Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest573Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest574Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest574Filler.json
index 25484ed8a..25484ed8a 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest574Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest574Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest575Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest575Filler.json
index cc4c0d999..cc4c0d999 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest575Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest575Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest576Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest576Filler.json
index e3bfbaee8..e3bfbaee8 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest576Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest576Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest577Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest577Filler.json
index 2d6d6d91b..2d6d6d91b 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest577Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest577Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest578Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest578Filler.json
index b3497f099..b3497f099 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest578Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest578Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest579Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest579Filler.json
index 235361bfe..235361bfe 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest579Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest579Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest580Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest580Filler.json
index bef7a4ca9..bef7a4ca9 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest580Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest580Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest581Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest581Filler.json
index 9f4c08172..9f4c08172 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest581Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest581Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest582Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest582Filler.json
index dd8f09011..dd8f09011 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest582Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest582Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest583Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest583Filler.json
index 309e4d6bf..309e4d6bf 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest583Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest583Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest584Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest584Filler.json
index 05a8d5ed0..05a8d5ed0 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest584Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest584Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest585Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest585Filler.json
index 412ac5f3c..412ac5f3c 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest585Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest585Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest586Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest586Filler.json
index 343546533..343546533 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest586Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest586Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest587Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest587Filler.json
index 541e9fd40..541e9fd40 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest587Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest587Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest588Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest588Filler.json
index 3f6c3c1ac..3f6c3c1ac 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest588Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest588Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest589Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest589Filler.json
index d78d22811..d78d22811 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest589Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest589Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest592Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest592Filler.json
index 624be0102..624be0102 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest592Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest592Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest594Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest594Filler.json
index 5660090b6..5660090b6 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest594Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest594Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest596Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest596Filler.json
index e33ce4879..e33ce4879 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest596Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest596Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest597Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest597Filler.json
index df9a51164..df9a51164 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest597Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest597Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest599Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest599Filler.json
index 31aae7e73..31aae7e73 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest599Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest599Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest600Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest600Filler.json
index b97120374..b97120374 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest600Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest600Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest601Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest601Filler.json
index a6a3dafbc..a6a3dafbc 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest601Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest601Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest602Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest602Filler.json
index c40d7175f..c40d7175f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest602Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest602Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest603Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest603Filler.json
index 0e29b48a6..0e29b48a6 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest603Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest603Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest604Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest604Filler.json
index b4b49227f..b4b49227f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest604Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest604Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest605Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest605Filler.json
index 38f132fbe..38f132fbe 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest605Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest605Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest607Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest607Filler.json
index 427c7386f..427c7386f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest607Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest607Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest608Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest608Filler.json
index b7b40c9db..b7b40c9db 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest608Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest608Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest609Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest609Filler.json
index 4e1702b10..4e1702b10 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest609Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest609Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest610Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest610Filler.json
index d9b732de5..d9b732de5 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest610Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest610Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest611Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest611Filler.json
index 7c0c8f82a..7c0c8f82a 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest611Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest611Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest612Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest612Filler.json
index 0ab6252b7..0ab6252b7 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest612Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest612Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest615Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest615Filler.json
index 0790e6111..0790e6111 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest615Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest615Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest616Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest616Filler.json
index 57ddef909..57ddef909 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest616Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest616Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest618Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest618Filler.json
index a2d84e4eb..a2d84e4eb 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest618Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest618Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest619Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest619Filler.json
index 1ae16d41c..1ae16d41c 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest619Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest619Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest620Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest620Filler.json
index efa2030f2..efa2030f2 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest620Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest620Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest621Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest621Filler.json
index eaf3a0b3f..eaf3a0b3f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest621Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest621Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest624Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest624Filler.json
index d67a20585..d67a20585 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest624Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest624Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest625Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest625Filler.json
index 66a7f66eb..66a7f66eb 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest625Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest625Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest626Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest626Filler.json
index d6be6791e..d6be6791e 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest626Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest626Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest627Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest627Filler.json
index 3bc3bdc78..3bc3bdc78 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest627Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest627Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest628Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest628Filler.json
index f701b49f4..f701b49f4 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest628Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest628Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest629Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest629Filler.json
index fb6d4d020..fb6d4d020 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest629Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest629Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest630Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest630Filler.json
index 4f799f894..4f799f894 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest630Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest630Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest632Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest632Filler.json
index 5b686f30e..5b686f30e 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest632Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest632Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest633Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest633Filler.json
index d2c5fe754..d2c5fe754 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest633Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest633Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest635Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest635Filler.json
index c8f1336b6..c8f1336b6 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest635Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest635Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest636Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest636Filler.json
index c7079d58b..c7079d58b 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest636Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest636Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest637Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest637Filler.json
index 6e8ce82ff..6e8ce82ff 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest637Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest637Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest638Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest638Filler.json
index 54549c34a..54549c34a 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest638Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest638Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest639Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest639Filler.json
index fec8dc5b0..fec8dc5b0 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest639Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest639Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest640Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest640Filler.json
index db0bc9e52..db0bc9e52 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest640Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest640Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest641Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest641Filler.json
index b2bc4ed4d..b2bc4ed4d 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest641Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest641Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest642Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest642Filler.json
index 5c745d975..5c745d975 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest642Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest642Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest643Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest643Filler.json
index 2d1dd7953..2d1dd7953 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest643Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest643Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest644Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest644Filler.json
index 85c7dd7e3..85c7dd7e3 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest644Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest644Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest645Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest645Filler.json
index e80dd93d3..e80dd93d3 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest645Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest645Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetest646Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest646Filler.json
index 6edc63c79..6edc63c79 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetest646Filler.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest646Filler.json
diff --git a/src/GeneralStateTestsFiller/stRandom2/randomStatetest647Filler.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetest647Filler.json
new file mode 100644
index 000000000..f35af6633
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetest647Filler.json
@@ -0,0 +1,61 @@
+{
+    "randomStatetest647" : {
+        "_info" : {
+            "comment" : "Malicious bytecode found by fuzztest tool: returndatacopy(0,-1)"
+        },
+	"env":{
+		"currentCoinbase":"0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+		"currentDifficulty":"0x20000",
+		"currentGasLimit":"0x42fe8c95373ea1",
+		"currentNumber":"0x01",
+		"currentTimestamp":"0x03e8",
+		"previousHash":"0xb9cdadfa4eb6b43788795e580e7cb36b4c85348412173e7bb3b9e7e954f7949f"
+	},
+	"expect" : [
+		{
+		        "indexes" : {
+		            "data" : -1,
+		            "gas" : -1,
+		            "value" : -1
+		        },
+		        "network" : ["Byzantium"],
+		        "result" : {
+		        	"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b":{
+					"balance":"994213071"
+				}
+		        }
+   		}
+	],
+	"pre":{
+		"0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b":{
+			"balance":"1000000000",
+			"code":"",
+			"nonce":"0x00",
+			"storage":{
+			}
+		},
+		"0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b":{
+			"balance":"0x00",
+			"code":"0x6001600160000360003e00",
+			"nonce":"0x07",
+			"storage":{
+			}
+		}
+	},
+	"transaction":{
+		"data":[
+			""
+		],
+		"gasLimit":[
+			"0x584d31"
+		],
+		"gasPrice":"0x01",
+		"nonce":"0x00",
+		"secretKey":"0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+		"to":"0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+		"value":[
+			"0x00"
+		]
+	}
+  }
+}
diff --git a/src/GeneralStateTestsFiller/stRandom/randomStatetestFiller.json b/src/GeneralStateTestsFiller/stRandom2/randomStatetestFiller.json
index a69471a4f..a69471a4f 100644
--- a/src/GeneralStateTestsFiller/stRandom/randomStatetestFiller.json
+++ b/src/GeneralStateTestsFiller/stRandom2/randomStatetestFiller.json
diff --git a/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_0_0_following_successful_createFiller.json b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_0_0_following_successful_createFiller.json
index 0d7c02a66..c6f1f2a1f 100644
--- a/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_0_0_following_successful_createFiller.json
+++ b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_0_0_following_successful_createFiller.json
@@ -22,7 +22,7 @@
                         }
                     },
                     "945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                        "shouldexist" : false
+                        "shouldnotexist" : "1"
                     }
                 }
             },
diff --git a/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_afterFailing_createFiller.json b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_afterFailing_createFiller.json
new file mode 100644
index 000000000..638691070
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_afterFailing_createFiller.json
@@ -0,0 +1,64 @@
+{
+    "returndatacopy_afterFailing_create" : {
+	"_info" : {
+	    "comment" : "Returndatacopy after failing create case due to 0xfd code."
+	}, 
+        "env" : {
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x20000",
+            "currentGasLimit" : "0x0a00000000",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "expect" : [
+            {   "indexes" : {
+                   "data" : -1,
+                   "gas" : -1,
+                   "value" : -1
+                },
+                "network" : ["Byzantium"],
+                "result" : {
+                    "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                        "storage" : {
+                            "0x00" : "0x20",
+			    "0x01" : "0x02"
+                        }
+                    }
+                }
+            }
+        ],
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x00",
+                "code" : "{ (MSTORE 0 0x600260005260206000fd) (create 0 22 10) (SSTORE 0 (RETURNDATASIZE)) (RETURNDATACOPY 0 0 32) (SSTORE 1 (MLOAD 0)) }",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "0x0a00000000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "value" : [
+                "0x00"
+            ]
+        }
+    }
+}
diff --git a/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_following_too_big_transferFiller.json b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_following_too_big_transferFiller.json
index 27bba6316..a42400913 100644
--- a/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_following_too_big_transferFiller.json
+++ b/src/GeneralStateTestsFiller/stReturnDataTest/returndatacopy_following_too_big_transferFiller.json
@@ -1,8 +1,8 @@
 {
     "returndatacopy_following_too_big_transfer" : {
-	"_info" : {
-	    "comment" : "This test tries RETURNDATACOPY with a non-zero size after a CALL that fails because of insufficient balance."
-	},
+        "_info" : {
+            "comment" : "This test tries RETURNDATACOPY with a non-zero size after a CALL that fails because of insufficient balance."
+        },
         "env" : {
             "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "currentDifficulty" : "0x20000",
diff --git a/src/GeneralStateTestsFiller/stReturnDataTest/returndatasize_after_oog_after_deeperFiller.json b/src/GeneralStateTestsFiller/stReturnDataTest/returndatasize_after_oog_after_deeperFiller.json
new file mode 100644
index 000000000..d2266b335
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stReturnDataTest/returndatasize_after_oog_after_deeperFiller.json
@@ -0,0 +1,98 @@
+{
+    "returndatasize_after_oog_after_deeper" : {
+        "_info" : {
+            "commment" : "transaction calls A (CALL B(CALL C(RETURN) OOG) 'check buffers')"
+        },
+        "env" : {
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x20000",
+            "currentGasLimit" : "0x0a00000000",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance": "0x1000000000",
+                "code": "",
+                "nonce": "0x0",
+                "storage": {}
+            },
+            "0x1000000000000000000000000000000000000001": {
+                "balance" : "0x00",
+                "code": "{ (seq (SSTORE 2 (CALL 100000 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 32)) (SSTORE 0 (RETURNDATASIZE))) (SSTORE 1 (MLOAD 0))}",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0xffffffff",
+                    "0x01" : "0xffffffff",
+                    "0x02" : "0xffffffff"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x100000000000",
+                "code" : "{ (seq (CALL 100000 0xbb00000000000000000000000000000000000000 0 0 0 0 0) (while 1 (SSTORE 0 1)) )}",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xbb00000000000000000000000000000000000000" : {
+                "balance" : "0x00",
+                "code" : "{ (seq (MSTORE 0 255) (RETURN 0 32) )}",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "expect": [
+            {
+                "indexes" : {
+                   "data" : -1,
+                   "gas" : -1,
+                   "value" : -1
+                },
+                "network" : ["Byzantium", "Constantinople"],
+                "result" : {
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x00" : "0x00",
+                            "0x01" : "0x00",
+                            "0x02" : "0x00"
+                        }
+                    }
+                }
+            },
+            {
+                "indexes" : {
+                   "data" : -1,
+                   "gas" : -1,
+                   "value" : -1
+                },
+                "network" : ["Frontier", "Homestead", "EIP158"],
+                "result" : {
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x00" : "0xffffffff",
+                            "0x01" : "0xffffffff",
+                            "0x02" : "0xffffffff"
+                        }
+                    }
+                }
+            }
+        ],
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "0x0a00000000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to":  "0x1000000000000000000000000000000000000001",
+            "value" : [
+                "0x00"
+            ]
+        }
+    }
+}
diff --git a/src/GeneralStateTestsFiller/stReturnDataTest/returndatasize_bugFiller.json b/src/GeneralStateTestsFiller/stReturnDataTest/returndatasize_bugFiller.json
new file mode 100644
index 000000000..1684943e1
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stReturnDataTest/returndatasize_bugFiller.json
@@ -0,0 +1,89 @@
+{
+    "returndatasize_bug" : {
+	"_info" : {
+	    "comment" : "RETURNDATASIZE after a failing CALL (due to insufficient balance) should return 0"
+	},
+        "env" : {
+            "currentCoinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "currentDifficulty" : "0x20000",
+            "currentGasLimit" : "0x0a00000000",
+            "currentNumber" : "0x01",
+            "currentTimestamp" : "0x03e8",
+            "previousHash" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
+        },
+        "expect" : [
+            {   "indexes" : {
+                   "data" : -1,
+                   "gas" : -1,
+                   "value" : -1
+                },
+                "network" : ["EIP150", "EIP158", "Frontier", "Homestead"],
+                "result" : {
+                    "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    }
+                }
+            },
+            {   "indexes" : {
+                   "data" : -1,
+                   "gas" : -1,
+                   "value" : -1
+                },
+                "network" : ["Byzantium"],
+                "result" : {
+                    "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                        "storage" : {
+                            "0x00" : "0x00"
+                        }
+                    },
+		    "0x1f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                        "storage" : {
+                            "0x01" : "0x00"
+                        }
+                    }
+                }
+            }
+        ],
+        "pre" : {
+            "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "{ (CALL 1 0x1f572e5295c57f15886f9b263e2f6d2d6c7b5ec6 50000 0 0 0 0) (SSTORE 0 (RETURNDATASIZE)) }",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1f572e5295c57f15886f9b263e2f6d2d6c7b5ec6" : {
+                "balance" : "0",
+                "code" : "{ (CALL 10 1 50000 0 0 0 0) (SSTORE 1 1) }",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x6400000000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "transaction" : {
+            "data" : [
+                ""
+            ],
+            "gasLimit" : [
+                "0x0a00000000"
+            ],
+            "gasPrice" : "0x01",
+            "nonce" : "0x00",
+            "secretKey" : "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+            "to" : "0x0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6",
+            "value" : [
+                "0x00"
+            ]
+        }
+    }
+}
diff --git a/src/GeneralStateTestsFiller/stRevertTest/PythonRevertTestTue201814-1430Filler.json b/src/GeneralStateTestsFiller/stRevertTest/PythonRevertTestTue201814-1430Filler.json
new file mode 100644
index 000000000..b7120c172
--- /dev/null
+++ b/src/GeneralStateTestsFiller/stRevertTest/PythonRevertTestTue201814-1430Filler.json
@@ -0,0 +1,62 @@
+{
+  "PythonRevertTestTue201814-1430": {
+    "_info" : {
+	"comment" : "A random test that had failed in Python ethereum implementation"
+    },
+    "pre": {
+      "0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+        "code": "0x6102fa60ff60f561014873c94f5374fce5edbc8e2a8697c15331677e6ebf0b630277795afa689497edb6a665eae52f3d625249756103a55260a860fb60cb3e6102dd6103e0fd6f568a159c0cae9044d258c55b10f4d100628d29ab781df7fcebb789e2a8cdbaa9c67c42cd1ebe81716ead0e94c7216d279dd3a0b3de311596d54729287873449ccce511e6991b3dc636a178159a3d9a06227462cd9a6768ccba17c2cb06de468e95730bf78e55af17e19973f2c3f5d4c21c169890b9a9672491f91aa1e7142667060d385ed594e21b6d02b23a6c4c50e7ab6a3ef66f83a2927f9845b4ba85c4fdfbd0054a0123ad93eff4b525b0f4b08d285f36f3bcac6a985b66906c348472b7cb047bc5a02e618666f0c50eecdc11f20fc1dc41c2fd957752e55ede4e56f469f536a04d436ad418a1ca7a44c0173c10f1806ba284f9c9c7c13670005de594dec538cd56c2746b3bfdfa7683ae0df68bbcb5347d61be606ef617322e6448e3e4124dbe061257a8f486529de397f08ce92502a37b957f855818082b5b5b49e36de5a83e8a270663088571bf2fdf8f5f2961031452326fb9499741e3859928a237f5e5df84c13c6043556b1e82328f9093e64defbdd07d7774d84835800999791abc41260472d96f604d07198e859adc0b70806beae7200cf116d2b55e89ddd564abc36d900e69a68b0f0e9e4f129987288153605d7d01c42f3b109ed2bd72a6cf13500241c2a5e5c4e17ea9ed9b05ba9b57d70d63d270ece77f6ecf21d3a41ad554f79584dcab761d4c8437774cad4bb13b2bece140358df93e76c0f49abe102cd44e474ab71c0237247865fa2add74c8b2a33d6f7041c5718a2554a72662720296dff5b377b559df4558b8a5b2c9e7d15eb3947a70064f935c8fdf0a4e726f644aa31b42c10280e50ea92a366c3d060c1270c6a16a75522fbeb3d7cca702807f5217816eab9cceb9e237ee8fde4ed3a23d3ec87adb334ac1caa7e06523b0132dd615cf3fc16140d34c191617823c3a7bf47c42bc36b69cb4385463595c7f6f9ea451e05303603e0cd401e13d6ff744e2a673824d943941551704ff14df7fa8646efbb2d8abc4ac6e258e9924924b8001f8f0650d66b37411d484b18f41e77c792bd1c169fa52bbfc8af4a45f20acb0ef95db2ecbc0d4eadbbbf6732f648bd33b36336dc0faf0cf1970bcd38093a50a44fd6b253b0e74f2706239c499217b8c3263dae332e254711d5d5e7e795c998cceed14cf46977e7d3cbb35783c79ef0530c3a8ac3fd8d49f10bb0ae919fa149adead67dae035627de430622813ac6271b51873b94f5374fce5edbc8e2a8697c15331677e6ebf0b3c7fb9ba628e056e0e87e029b8e5f42821d775338e6774301ecb428b3938236ee22b7d0b5edf2ad6997869f427ba0672a7168614233e85f61dae5ed4283a53f60570116dad586dce62833a62ca8c914c641f8660526101d761010761031c73c94f5374fce5edbc8e2a8697c15331677e6ebf0b6333d3d55ff4611a5b631c4ea729816102566103ce6101c161014a73000000000000000000000000000000000000000663202b2ea8f4610221610106602e3e648a95029ecb72849fe0943cb9d854c7d50ad04cfdfe648e286876b8f2b53e55fe01a152c8496cbcc6997447062b734cebde04796c6452e9efc4aba5bf071cbff56208a525a8ef5f52399b4f33697bd988884f58166d734881774eff46d77bb189c89c55b1c6591f178d2d7c21bf2b023adf9bc5b8621235e3346d98d56047a3f71241fd5a24abbb0c73fc463fb8a5e67e32055696fe51258dd07526ebd87e439bcebb514ae26dc12d653a5c1263705109097ec5dcdb3918ab114985f7097fd3003b50e58fba91007825a6b800f644eaa306051808460fc3b2d8e276b2187c7b583ff29ee0b0c34f9ee57bac9ebb996402e3300ddf06c760fc5f531f746b1e2beda7a15c07f90f92422822e8d33c5d2409ea7375197f7cd6d61770eddb078206cfc7c5006cd0e97da9ec65fa4fc683da22cfaf6dfc995feb5f8386a052851fc502f32e7ef9346e3d4633def4c0a4b9be12f2cd7c646062e14ca37cfb977524f677714c3d994ea05f1997a2462fc0ab20ed2a5958f37126029b6102056102c9605d6103a173b94f5374fce5edbc8e2a8697c15331677e6ebf0b6302e83dbef4",
+        "nonce": "0x1d",
+        "balance": "0x845252b8509dc215",
+        "storage": {}
+      },
+      "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+        "code": "0x7abee2a270429abbd3ff3b9945f72f58dcf4f8b344417a87dfa1ebd7601f5232609b6103ee61027b6101326342a46f5073b94f5374fce5edbc8e2a8697c15331677e6ebf0b632c1e2816f26101726101ec61013161012473d94f5374fce5edbc8e2a8697c15331677e6ebf0b632318d76ffa7201a0ff381bb40bb828d7781d2ef7c0fd8695f77c05465fbadf99fdffef2afd94b0e76531b6ea0d23d2332d13c20368a072644e41bc113079a6b1ebc3464527e34c26a4379f9dfe4f8e57981a9fc08558c90d537538079f1921b60fe6fa448171fec55c4c63e81171221164cf72f489a45775e83a2f5427eab647b075a910929de0a6554fc1426b49547acd8e2c770339616ce9c501fb746715dd4a20219229d0673ac055997e3bd089a6663f6dff488574195b848fbb357eb7be1fff076e997770d03b7028536103b36102846103056102db73b94f5374fce5edbc8e2a8697c15331677e6ebf0b6347cfe65df4423a6b8679871dc28aa5a1399b21c86102e460476101f3605b73ffffffffffffffffffffffffffffffffffffffff6311ecd01bfa76afa8155ecd75dd05f9d7eb42fa3e79c6a2109dff2a1e5361030a6101b2fd610263605861011761027f63459d135b7300000000000000000000000000000000000000056342ce224df274e612fbe000bed18eec8345f005f537c72820d8b97360e3526b50ae523a8f7467ae14a8bd9a6aaee55862b685e32476cc6762ae2c4068cf55729540d111f44c9260e76101bc6103f33e68639458dae7ad2a9b38629ed3bb1060d861036afd610123610359636db4b55bf0626021696101775263ea8a7b3a641bcf9219191a6103be6103716101f73e74c0413cb5d609ca9a51645238e4f1f8268f973c3a0169a0b67479a345d1e700655360166101736102f2610214633ff89b317300000000000000000000000000000000000000066335adeabdf13d7ee6d218af54c3d8045447d06c726801695cfa26fdfaa6460a8685cd662855a5547f5716140ae0b1e25aeaf04ae7cf54e8aa7a22206da5a6e52bdd3ef82ad40a46815177d25811167b0a3f66a727652592924dc1291a6085d537c5da6101b1601d6103a33e752d6272a54f882460bc76407d6361c40cc56bc88a8bc960726103ec6102c16101f3731000000000000000000000000000000000000000635f449586f4",
+        "nonce": "0x1d",
+        "balance": "0x882fd85bc18c9f00",
+        "storage": {}
+      },
+      "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+        "code": "",
+        "nonce": "0x00",
+        "balance": "0xab56295c9d120548",
+        "storage": {}
+      },
+      "0x1000000000000000000000000000000000000000": {
+        "code": "0x601361019f6101013e6f338db2b1165b4918f178852663192a956d79a68b50eefdc639ca0b62ab4d52771db054ccc801c0666b34b3c6242bbfc5e98f20c14fb95e016718be9ad033d50e21675ff59297861847ea6a911a6a9d135e2f826dc6037d850e0db21d105b8732a34b873c7d943050b8659794f0bd3e841d35a2231e65f697f8cde1176728fa2051e87933cf66858e4e5e91baa7764fc1e9ffe4c7b15ba600e88f095989dc68f47ed704be2b99601761021563200fbd63f07e41c7f86732f4d5419b41e6887cca98e0943f141a5c66df98bd0c6d6c4cec657893afaa8ce1769c96cd0751aa76a98c8196fa8c92e70d7bda176299c91c3e7a7f05de3181109b8194387746f9ec15a6e0233f759e43360bd4e0a06e4e9f395117afcd072774ce12d13dc761016152303a683305858002a92140b678508e3a3be377d4825dbf618a393c7c061e75a8a496a33afe0f72017f2e33549e321838b083d48893f23dced4597e2e9ea08fe3f80970d6334b6c6f1fde8bcc81d03a7ccc244231cb6606dba6d06ec1c5158ef0db6994192acbd4cac6ab6ac8449d80fc2c32471946e071d9606bd390266d7f712766f4765076283ad6687450d7ab4df6f3f6ee9661014a70b802ec9d7ed96dc0b9ce7bd14b193dc1f05376d11ce19283c7f651d4d2e7c180715ff7fcbc995ea8b2766213cc517d6dad16d17f29a93220ce0ddb0a65d3d474dbc39cba5bcb3d4fcf9fef1910607d64c04511df277f522ab2475fbb2ba0720711a903dbecfa0429bf11e6e90cbb0f13d4ee050c52c87365e0216b4096186fc604fb563fa59f1263ee91d5695e407fdffe82ca1558f7876a93f3a218dd9ba6901fdea93d6be498f0b0e1874331115e31aa6fad4d87227362a9ec3e1c1be11cdb2309697bbc0c692eeadfa9161669b8aec24564487dc74f8e7d17e6a133b5dbe576838697de73f856197203ef1a3a54f7edb0dbd60f9d5274db6b5c1477169b77f0d817ed731a20db4b9e5b83d2786bffefab084a31c4afda168156612f281da0be688e5bdb1f3176ed78bc62343a7665abad6573482449e68b3acfe820993d77df5785384d51aaa0612dab5ddbf2a9bf550736ad422933878861011961023ffd608f61022d61021661036e635af7465b73ffffffffffffffffffffffffffffffffffffffff63792c6916f16ed70693587df6ccfae5218d01559bac60156102006101adfd",
+        "nonce": "0x15",
+        "balance": "0x5b1936a53e6e440f",
+        "storage": {}
+      },
+      "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b": {
+        "code": "0x610326610100f379c940b5f2046740058558468f238b85db7f6bbe3f3d51e92a3e3268b7f7c4147541c695f376705288410b81b217e80726fb9e4c5c7b4c49eca0c1b6b97e117c16c26c9816459f38396ffc36da48d65defdc7d055cbc846c07e81cfab0fb607c6cbc968774d4de7df8e3236f581e688cc2081a96b1cad9e0609b70f4fddda49ae97714e7d325ceab23acd5f46ba15b5210474116121921a04f68f3f933b9ad91b735bf71bfe41da706499c5d47b6de1fe398cb91fdf66481cbb8661d71d457cf3cef75dabf5ea496d7012f4c56b9fe70e6c4204720e3ce66874cead08499d57a547b97d37744ce205e051f296fb116fc9e5f3c280919aff3c93c5d5cefff9a6102d86103ca6364b68c8ef07d",
+        "nonce": "0x1d",
+        "balance": "0x054c814f188394c8",
+        "storage": {}
+      }
+    },
+    "env": {
+      "currentNumber": "0x01",
+      "currentDifficulty": "0x20000",
+      "currentTimestamp": "0x03e8",
+      "currentGasLimit": "0x14a0583da74c9c",
+      "currentCoinbase": "0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+      "previousHash": "0xbe3aaa6657719af4fbf6b9741d3c2c1eca7446e7b87ce36eb18a407fca527573"
+    },
+    "transaction": {
+      "secretKey": "0x45a915e4d060149eb4365960e6a7a45f334393093061116b197e3240065ff2d8",
+      "gasLimit": [
+        "0x2857ab"
+      ],
+      "nonce": "0x00",
+      "value": [
+        "0x254ffcc0"
+      ],
+      "to": "0xd94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+      "gasPrice": "0x02",
+      "data": [
+        "0x66a9b45d44c78cfe774333fe0c49418dd61f183d41132f5340e48ababb825a26eb0a75c0ca693a8b465121200fd21a7b4c365a65a3255278f672705e5ca0f6146fccd36a6e5b9decfb6e5096887651e829313a2cc9d5b518e25861c31ba04ed3f5a3310bd966993aa534b00785778d9545342410ce8c156d780a8cb4a65efed30aa9d6bd63c4778a134c9cb0c677ecda48aacef0c191de37e3cfdae69153747c2406995ea81bbae6a201663b9b37a6a9f597ae4f40e44e74ea92616bc2956328ced0d77412c265c2925470320e5f285d15a08a263b0a444516817c266bd51fe726677144df3c080d07dd47c4eb9e44a87541ddc5a697163260a06921033eb3542b375cd0d073dfb48f6acde07152794b5539563efff1afed3b0a6b15166526175e7184b83cc2de68df61ec5d65d1eee66ea376fcb84f2c73335db9fba49e3d40638cd7f462f1d3b315f17b8dc1f692a68b2431b166ee71a4ba159dd322b9fa5f3237dfb85d2594056102f261025b61021d6101d3631fe4bdc373ffffffffffffffffffffffffffffffffffffffff631ea09dc6f263edd580947c8177bd72d2244f7652371e3428d28bc6356c553b18d00e6b3cf60206c273abbd7763059f61940b0d19fde33f7b5a96080d25791e9ae89c718dd41c3f57b0c304fbb83978de28d23499bdd19c0472301ff527ccc9f7ed74a8dbd906b468d448fba77f38f193e3047b02e40beb08b4f11707681ef103ec1b00585a85f27227a179f15e7e97a359268b06ff34bcee23a869974fbca6e201cb16179743ac0f8c9f8603d570e26a5aad5217ebfff3140716923723efaa79b6cd87fbc9fd408d4ac5a048e43fb4e7a2b94053bf1fb7257562977725cde415738a99e1a7690cbe409744b737367dedc82e3063516c5bc57e35fcb2038306d9a3a6e46103515279ddcb9d30879e470f5dd81e1148184f62bd61ae9708ff61cee25c63694a73437a42be5043b1fde117ba383682ba0d91e0db8b29c882a044d0c8bb49056a25a66d8480df1b1ccc2564791df94f43d5802aa8f44bf70a6817ed784e5725bdc7718a54d6a567234286085240ba847d575dac25d7fc32c59999a9d38fee0d25e7c23986009c5bb022f7d28a2cab6e01a4bb37dd42ea42d5141d55f5730c7bd82bf08bff3928aea77e7153bcc4a3a53996be367ec98cb6fe85797e771d020284d4d302c8b4ebe6b28a9c64a9ae2ad6894716732f6b245e7fdc5243f79a0ae9b8d874900caa1c5796a2854ceddb00a82b4ec01b513ed61c72ce89400a06fe90a109bad6d5e028143e7552937a0136347eb71a49db0072c87bd437b9cd7b2f7e6e9f3a85875c9ede6036650f9d06d4c2e8692caf2e87043c0bf5a2359c66431acbb35dcbfc6a7b86074b99c9e6f959d8417784e5e40c854c280218c0cd4e98dc3bc44f7d651d7191ead455"
+      ]
+    }
+  }
+}
diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json
index 22e183874..21297119a 100644
--- a/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json
+++ b/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateAddressCollisionFiller.json
@@ -31,7 +31,7 @@
                 }
             },
 	    {
-		"comment" : "OOG in subcall",
+                "//comment" : "OOG in subcall",
                 "indexes" : {
                     "data" : 0,
                     "gas" : 1,
@@ -39,12 +39,12 @@
                 },
                 "network" : ["ALL"],
                 "result" : {
-		    "3e180b1862f9d158abb5e519a6d8605540c23682" : {
-		        "balance" : "0x06",
+                    "3e180b1862f9d158abb5e519a6d8605540c23682" : {
+                        "balance" : "0x06",
                         "code" : "{ [[0]] 1 [[1]] (CALL (CALLDATALOAD 0) 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[4]] 12 }",
                         "nonce" : "54",
                         "storage" : {
-			    "0x00" : "0x01",
+                            "0x00" : "0x01",
                             "0x04" : "0x0c"
                         }
 		    },
@@ -55,7 +55,7 @@
                 }
             },
 	    {
-		"comment" : "OOG after subcall",
+                "//comment" : "OOG after subcall",
                 "indexes" : {
                     "data" : 1,
                     "gas" : 0,
@@ -63,8 +63,8 @@
                 },
                 "network" : ["EIP158", "EIP150"],
                 "result" : {
-		    "3e180b1862f9d158abb5e519a6d8605540c23682" : {
-		        "balance" : "0x05",
+                    "3e180b1862f9d158abb5e519a6d8605540c23682" : {
+                        "balance" : "0x05",
                         "code" : "{ [[0]] 1 [[1]] (CALL (CALLDATALOAD 0) 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[4]] 12 }",
                         "nonce" : "54",
                         "storage" : {
@@ -77,7 +77,7 @@
                 }
             },
 	    {
-		"comment" : "OOG after subcall",
+                "//comment" : "OOG after subcall",
                 "indexes" : {
                     "data" : 1,
                     "gas" : 0,
@@ -85,8 +85,8 @@
                 },
                 "network" : ["Homestead", "Frontier"],
                 "result" : {
-		    "3e180b1862f9d158abb5e519a6d8605540c23682" : {
-		        "balance" : "0x05",
+                    "3e180b1862f9d158abb5e519a6d8605540c23682" : {
+                        "balance" : "0x05",
                         "code" : "0x60016000556000600060006000600073b000000000000000000000000000000000000000600035f1600155600c600455",
                         "nonce" : "54",
                         "storage" : {
@@ -99,7 +99,7 @@
                 }
             },
 	    {
-		"comment" : "double OOG",
+                "//comment" : "double OOG",
                 "indexes" : {
                     "data" : 0,
                     "gas" : 0,
@@ -107,9 +107,9 @@
                 },
                 "network" : ["ALL"],
                 "result" : {
-		    "3e180b1862f9d158abb5e519a6d8605540c23682" : {
-		        "balance" : "0x05",
-                "code" : "{ [[0]] 1 [[1]] (CALL (CALLDATALOAD 0) 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[4]] 12 }",
+                    "3e180b1862f9d158abb5e519a6d8605540c23682" : {
+                        "balance" : "0x05",
+                        "code" : "{ [[0]] 1 [[1]] (CALL (CALLDATALOAD 0) 0xb000000000000000000000000000000000000000 0 0 0 0 0) [[4]] 12 }",
                         "nonce" : "54",
                         "storage" : {
                         }
diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateOOGFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateOOGFiller.json
index 2e7aa1ea4..47b0db599 100644
--- a/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateOOGFiller.json
+++ b/src/GeneralStateTestsFiller/stRevertTest/RevertDepthCreateOOGFiller.json
@@ -10,7 +10,7 @@
         },
         "expect" : [
             {
-		"comment" : "NO OOG",
+                "//comment" : "NO OOG",
                 "indexes" : {
                     "data" : 1,
                     "gas" : 1,
@@ -18,10 +18,10 @@
                 },
                 "network" : ["EIP158"],
                 "result" : {
-		    "3e180b1862f9d158abb5e519a6d8605540c23682" : {
-			"nonce" : "1"
-		     },
-		    "a000000000000000000000000000000000000000" : {
+                    "3e180b1862f9d158abb5e519a6d8605540c23682" : {
+                    "nonce" : "1"
+                     },
+                    "a000000000000000000000000000000000000000" : {
                         "storage" : {
                             "0x00" : "0x01",
                             "0x01" : "0x01",
@@ -37,7 +37,7 @@
                 }
             },
 	    {
-		"comment" : "NO OOG",
+                "//comment" : "NO OOG",
                 "indexes" : {
                     "data" : 1,
                     "gas" : 1,
@@ -45,10 +45,10 @@
                 },
                 "network" : ["EIP150"],
                 "result" : {
-		    "3e180b1862f9d158abb5e519a6d8605540c23682" : {
-			"nonce" : "0"
-		     },
-		    "a000000000000000000000000000000000000000" : {
+                    "3e180b1862f9d158abb5e519a6d8605540c23682" : {
+                        "nonce" : "0"
+                     },
+                    "a000000000000000000000000000000000000000" : {
                         "storage" : {
                             "0x00" : "0x01",
                             "0x01" : "0x01",
@@ -64,7 +64,7 @@
                 }
             },
 	    {
-		"comment" : "NO OOG",
+                "//comment" : "NO OOG",
                 "indexes" : {
                     "data" : 1,
                     "gas" : 1,
@@ -72,9 +72,9 @@
                 },
                 "network" : ["Frontier", "Homestead"],
                 "result" : {
-		    "3e180b1862f9d158abb5e519a6d8605540c23682" : {
-		        "shouldnotexist" : "1"
-		    },
+                    "3e180b1862f9d158abb5e519a6d8605540c23682" : {
+                        "shouldnotexist" : "1"
+                    },
 		    "a000000000000000000000000000000000000000" : {
 		        "storage" : {
 		        }
@@ -86,7 +86,7 @@
                 }
             },
 	    {
-		"comment" : "OOG in subcall",
+                "//comment" : "OOG in subcall",
                 "indexes" : {
                     "data" : 0,
                     "gas" : 1,
@@ -94,10 +94,10 @@
                 },
                 "network" : ["ALL"],
                 "result" : {
-		    "3e180b1862f9d158abb5e519a6d8605540c23682" : {
-			"shouldnotexist" : "1"
-		    },
-		    "a000000000000000000000000000000000000000" : {
+                    "3e180b1862f9d158abb5e519a6d8605540c23682" : {
+                        "shouldnotexist" : "1"
+                    },
+                    "a000000000000000000000000000000000000000" : {
                         "storage" : {
                             "0x00" : "0x01",
                             "0x04" : "0x0c"
@@ -110,7 +110,7 @@
                 }
             },
 	    {
-		"comment" : "OOG after subcall / double OOG",
+                "//comment" : "OOG after subcall / double OOG",
                 "indexes" : {
                     "data" : [1, 0],
                     "gas" : 0,
diff --git a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCallsFiller.json b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCallsFiller.json
index 2fa1c198b..c741ddf4f 100644
--- a/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCallsFiller.json
+++ b/src/GeneralStateTestsFiller/stRevertTest/RevertOpcodeCallsFiller.json
@@ -78,7 +78,7 @@
                 }
             },
 	    {
-		"comment" : "OOG",
+                "//comment" : "OOG",
                 "indexes" : {
                     "data" : 0,
                     "gas" : 1,
diff --git a/src/GeneralStateTestsFiller/stSolidityTest/AmbiguousMethodFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/AmbiguousMethodFiller.json
index 489d6eb74..a5725a976 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/AmbiguousMethodFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/AmbiguousMethodFiller.json
@@ -28,23 +28,23 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//comment1" : "contract contract1",
-		"//comment2" : "{",
-		"//comment3" : "    uint value;",
-		"//comment4" : "    function run()",
-		"//comment5" : "    {",
-		"//comment6" : "        value = 225;",
-		"//comment7" : "    }",
-		"//comment8" : "}",
-		"//comment9" : "",
-		"//comment10" : "contract contract2",
-		"//comment11" : "{",
-		"//comment12" : "    uint value2;",
-		"//comment13" : "    function run()",
-		"//comment14" : "    {",
-		"//comment15" : "        value2 = 335;",
-		"//comment16" : "    }",
-		"//comment17" : "}",
+                "//comment1" : "contract contract1",
+                "//comment2" : "{",
+                "//comment3" : "    uint value;",
+                "//comment4" : "    function run()",
+                "//comment5" : "    {",
+                "//comment6" : "        value = 225;",
+                "//comment7" : "    }",
+                "//comment8" : "}",
+                "//comment9" : "",
+                "//comment10" : "contract contract2",
+                "//comment11" : "{",
+                "//comment12" : "    uint value2;",
+                "//comment13" : "    function run()",
+                "//comment14" : "    {",
+                "//comment15" : "        value2 = 335;",
+                "//comment16" : "    }",
+                "//comment17" : "}",
                 "code" : "0x60003560e060020a90048063c040622614601557005b601b6021565b60006000f35b61014f60008190555056",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSolidityTest/CallInfiniteLoopFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/CallInfiniteLoopFiller.json
index a200b099c..4d5c219d9 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/CallInfiniteLoopFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/CallInfiniteLoopFiller.json
@@ -26,23 +26,23 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//comment1" : "contract recursiveMethods",
-		"//comment2" : "{",
-		"//comment3" : "    function testInfiniteLoop()",
-		"//comment4" : "    {",
-		"//comment5" : "        while(true){}",
-		"//comment6" : "    }",
-		"//comment7" : "    ",
-		"//comment8" : "    function testRecursiveMethods()",
-		"//comment9" : "    {",
-		"//comment10" : "        testRecursiveMethods2();",
-		"//comment11" : "    }",
-		"//comment12" : "    ",
-		"//comment13" : "    function testRecursiveMethods2()",
-		"//comment14" : "    {",
-		"//comment15" : "        testRecursiveMethods();",
-		"//comment16" : "    }",
-		"//comment17" : "}",
+                "//comment1" : "contract recursiveMethods",
+                "//comment2" : "{",
+                "//comment3" : "    function testInfiniteLoop()",
+                "//comment4" : "    {",
+                "//comment5" : "        while(true){}",
+                "//comment6" : "    }",
+                "//comment7" : "    ",
+                "//comment8" : "    function testRecursiveMethods()",
+                "//comment9" : "    {",
+                "//comment10" : "        testRecursiveMethods2();",
+                "//comment11" : "    }",
+                "//comment12" : "    ",
+                "//comment13" : "    function testRecursiveMethods2()",
+                "//comment14" : "    {",
+                "//comment15" : "        testRecursiveMethods();",
+                "//comment16" : "    }",
+                "//comment17" : "}",
                 "code" : "0x60003560e060020a90048063296df0df1460295780634893d88a146035578063981a316514604157005b602f604d565b60006000f35b603b6062565b60006000f35b6047605a565b60006000f35b5b600115605857604e565b565b60606062565b565b6068605a565b56",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSolidityTest/CallLowLevelCreatesSolidityFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/CallLowLevelCreatesSolidityFiller.json
index 969d0b243..daef56e6f 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/CallLowLevelCreatesSolidityFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/CallLowLevelCreatesSolidityFiller.json
@@ -30,32 +30,32 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//comment1": "contract subcaller",
-		"//comment2": "{",
-		"//comment3": "  function init(address a)",
-		"//comment4": "  {",
-		"//comment5": "    main(a).setdata(225);",
-		"//comment6": "  }",
-		"//comment7": "}",
-		"//comment8": "",
-		"//comment9": "contract main",
-		"//comment10": "{",
-		"//comment11": "   uint data;",
-		"//comment12": "   address msgsender;",
-		"//comment13": "   function run() returns (uint)",
-		"//comment14": "   {",
-		"//comment15": "       data = 1;",
-		"//comment16": "      msgsender = 0x095e7baea6a6c7c4c2dfeb977efac326af552d87;",
-		"//comment17": "       subcaller a = new subcaller();",
-		"//comment18": "       a.init(msgsender);",
-		"//comment19": "       return data;",
-		"//comment20": "   }",
-		"//comment21": "   ",
-		"//comment22": "   function setdata(uint _data)",
-		"//comment23": "   {",
-		"//comment24": "       data = _data;",
-		"//comment25": "   }",
-		"//comment26": "}",
+                "//comment1": "contract subcaller",
+                "//comment2": "{",
+                "//comment3": "  function init(address a)",
+                "//comment4": "  {",
+                "//comment5": "    main(a).setdata(225);",
+                "//comment6": "  }",
+                "//comment7": "}",
+                "//comment8": "",
+                "//comment9": "contract main",
+                "//comment10": "{",
+                "//comment11": "   uint data;",
+                "//comment12": "   address msgsender;",
+                "//comment13": "   function run() returns (uint)",
+                "//comment14": "   {",
+                "//comment15": "       data = 1;",
+                "//comment16": "      msgsender = 0x095e7baea6a6c7c4c2dfeb977efac326af552d87;",
+                "//comment17": "       subcaller a = new subcaller();",
+                "//comment18": "       a.init(msgsender);",
+                "//comment19": "       return data;",
+                "//comment20": "   }",
+                "//comment21": "   ",
+                "//comment22": "   function setdata(uint _data)",
+                "//comment23": "   {",
+                "//comment24": "       data = _data;",
+                "//comment25": "   }",
+                "//comment26": "}",
                 "code" : "0x60003560e060020a9004806330debb4214610021578063c04062261461003257005b61002c6004356100c7565b60006000f35b61003a610044565b8060005260206000f35b60006000600160008190555073095e7baea6a6c7c4c2dfeb977efac326af552d87600181905550606a6100d2600039606a60006000f0905080600160a060020a03166319ab453c600060008260e060020a026000526004600154600160a060020a03168152602001600060008660325a03f16100bc57005b505060005491505090565b80600081905550505600605e80600c6000396000f30060003560e060020a9004806319ab453c14601557005b601e6004356024565b60006000f35b80600160a060020a03166330debb42600060008260e060020a02600052600460e18152602001600060008660325a03f1605957005b50505056",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSolidityTest/CallRecursiveMethodsFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/CallRecursiveMethodsFiller.json
index fd6b2ca62..bfa7bdbac 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/CallRecursiveMethodsFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/CallRecursiveMethodsFiller.json
@@ -26,23 +26,23 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//comment1" : "contract recursiveMethods",
-		"//comment2" : "{",
-		"//comment3" : "    function testInfiniteLoop()",
-		"//comment4" : "    {",
-		"//comment5" : "        while(true){}",
-		"//comment6" : "    }",
-		"//comment7" : "    ",
-		"//comment8" : "    function testRecursiveMethods()",
-		"//comment9" : "    {",
-		"//comment10" : "        testRecursiveMethods2();",
-		"//comment11" : "    }",
-		"//comment12" : "    ",
-		"//comment13" : "    function testRecursiveMethods2()",
-		"//comment14" : "    {",
-		"//comment15" : "        testRecursiveMethods();",
-		"//comment16" : "    }",
-		"//comment17" : "}",
+                "//comment1" : "contract recursiveMethods",
+                "//comment2" : "{",
+                "//comment3" : "    function testInfiniteLoop()",
+                "//comment4" : "    {",
+                "//comment5" : "        while(true){}",
+                "//comment6" : "    }",
+                "//comment7" : "    ",
+                "//comment8" : "    function testRecursiveMethods()",
+                "//comment9" : "    {",
+                "//comment10" : "        testRecursiveMethods2();",
+                "//comment11" : "    }",
+                "//comment12" : "    ",
+                "//comment13" : "    function testRecursiveMethods2()",
+                "//comment14" : "    {",
+                "//comment15" : "        testRecursiveMethods();",
+                "//comment16" : "    }",
+                "//comment17" : "}",
                 "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463296df0df811460415780634893d88a14604d578063981a316514605957005b60476065565b60006000f35b6053607a565b60006000f35b605f6072565b60006000f35b5b6001156070576066565b565b6078607a565b565b60806072565b56",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSolidityTest/ContractInheritanceFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/ContractInheritanceFiller.json
index 4dae11ce5..a08f4df95 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/ContractInheritanceFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/ContractInheritanceFiller.json
@@ -28,43 +28,43 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//comment1" : "contract base",
-		"//comment2" : "{",
-		"//comment3" : "    function methodA() returns (uint32)",
-		"//comment4" : "    {",
-		"//comment5" : "        return 1;",
-		"//comment6" : "    }",
-		"//comment7" : "}",
-		"//comment8" : "",
-		"//comment9" : "contract frombase is base",
-		"//comment10" : "{",
-		"//comment11" : "    function methodA() returns (uint32)",
-		"//comment12" : "    {",
-		"//comment13" : "        return 2;",
-		"//comment14" : "    }",
-		"//comment15" : "}",
-		"//comment16" : "",
-		"//comment17" : "contract main",
-		"//comment18" : "{",
-		"//comment19" : "    bool returnValue;",
-		"//comment20" : "    function run() returns (bool)",
-		"//comment21" : "    {",
-		"//comment22" : "       returnValue = testInheretance();",
-		"//comment23" : "       return returnValue;",
-		"//comment24" : "    }",
-		"//comment25" : "   ",
-		"//comment26" : "    function testInheretance() returns (bool res)",
-		"//comment27" : "    {",
-		"//comment28" : "        res = true;",
-		"//comment29" : "        base contract1 = new base();",
-		"//comment30" : "        if (contract1.methodA() != 1)",
-		"//comment31" : "            return false;",
-		"//comment32" : "",
-		"//comment33" : "        frombase contract2 = new frombase();",
-		"//comment34" : "        if (contract2.methodA() != 2)",
-		"//comment35" : "            return false;",
-		"//comment36" : "    }",
-		"//comment37" : "}",
+                "//comment1" : "contract base",
+                "//comment2" : "{",
+                "//comment3" : "    function methodA() returns (uint32)",
+                "//comment4" : "    {",
+                "//comment5" : "        return 1;",
+                "//comment6" : "    }",
+                "//comment7" : "}",
+                "//comment8" : "",
+                "//comment9" : "contract frombase is base",
+                "//comment10" : "{",
+                "//comment11" : "    function methodA() returns (uint32)",
+                "//comment12" : "    {",
+                "//comment13" : "        return 2;",
+                "//comment14" : "    }",
+                "//comment15" : "}",
+                "//comment16" : "",
+                "//comment17" : "contract main",
+                "//comment18" : "{",
+                "//comment19" : "    bool returnValue;",
+                "//comment20" : "    function run() returns (bool)",
+                "//comment21" : "    {",
+                "//comment22" : "       returnValue = testInheretance();",
+                "//comment23" : "       return returnValue;",
+                "//comment24" : "    }",
+                "//comment25" : "   ",
+                "//comment26" : "    function testInheretance() returns (bool res)",
+                "//comment27" : "    {",
+                "//comment28" : "        res = true;",
+                "//comment29" : "        base contract1 = new base();",
+                "//comment30" : "        if (contract1.methodA() != 1)",
+                "//comment31" : "            return false;",
+                "//comment32" : "",
+                "//comment33" : "        frombase contract2 = new frombase();",
+                "//comment34" : "        if (contract2.methodA() != 2)",
+                "//comment35" : "            return false;",
+                "//comment36" : "    }",
+                "//comment37" : "}",
                 "code" : "0x7c010000000000000000000000000000000000000000000000000000000060003504633e0bca3b8114610039578063c0406226146100a857005b6100b55b600160008060456101ec8339604560006000f091508173ffffffffffffffffffffffffffffffffffffffff166381bda09b60206000827c010000000000000000000000000000000000000000000000000000000002600052600460006000866161da5a03f161011957005b6100bf60006100c961003d565b8060005260206000f35b8060005260206000f35b600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0016919091179081905560ff16919050565b505060005163ffffffff166002141561019d575b5b505090565b505060005163ffffffff1660011415610194575b60456101a7600039604560006000f090508073ffffffffffffffffffffffffffffffffffffffff166381bda09b60206000827c010000000000000000000000000000000000000000000000000000000002600052600460006000866161da5a03f16100ff57005b60009250610114565b600092506101145600603980600c6000396000f3007c0100000000000000000000000000000000000000000000000000000000600035046381bda09b8114602d57005b60026000818152602090f3603980600c6000396000f3007c0100000000000000000000000000000000000000000000000000000000600035046381bda09b8114602d57005b60016000818152602090f3",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSolidityTest/CreateContractFromMethodFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/CreateContractFromMethodFiller.json
index b9825847c..d2a3580ad 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/CreateContractFromMethodFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/CreateContractFromMethodFiller.json
@@ -73,31 +73,31 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//comment1": "contract TestContract",
-		"//comment2": "{",
-		"//comment3": "    function testMethod() returns (int res)",
-		"//comment4": "    {",
-		"//comment5": "        return 225;",
-    "//comment6": "    }",
-		"//comment7": "",
-		"//comment8": "    function destroy(address sendFoundsTo)",
-		"//comment9": "    {",
-		"//comment10": "        suicide(sendFoundsTo);",
-		"//comment11": "    }",
-		"//comment12": "}",
-		"//comment13": "",
-		"//comment14": "contract main",
-		"//comment15": "{",
-		"//comment16": "   function run() returns (uint)",
-		"//comment17": "   {",
-		"//comment18": "       createContractFromMethod();",
-		"//comment19": "   }",
-		"//comment20": "   ",
-		"//comment21": "   function createContractFromMethod() returns (TestContract a)",
-		"//comment22": "   {",
-		"//comment23": "       a = new TestContract();",
-		"//comment24": "   }",
-		"//comment25": "}",
+                "//comment1": "contract TestContract",
+                "//comment2": "{",
+                "//comment3": "    function testMethod() returns (int res)",
+                "//comment4": "    {",
+                "//comment5": "        return 225;",
+                "//comment6": "    }",
+                "//comment7": "",
+                "//comment8": "    function destroy(address sendFoundsTo)",
+                "//comment9": "    {",
+                "//comment10": "        suicide(sendFoundsTo);",
+                "//comment11": "    }",
+                "//comment12": "}",
+                "//comment13": "",
+                "//comment14": "contract main",
+                "//comment15": "{",
+                "//comment16": "   function run() returns (uint)",
+                "//comment17": "   {",
+                "//comment18": "       createContractFromMethod();",
+                "//comment19": "   }",
+                "//comment20": "   ",
+                "//comment21": "   function createContractFromMethod() returns (TestContract a)",
+                "//comment22": "   {",
+                "//comment23": "       a = new TestContract();",
+                "//comment24": "   }",
+                "//comment25": "}",
                 "code" : "0x60003560e060020a900480637ee17e1214601f578063c040622614602b57005b60256047565b60006000f35b6031603b565b8060005260206000f35b600060436047565b5090565b60006060605d600039606060006000f09050905600605480600c6000396000f30060003560e060020a90048062f55d9d14601e578063b9c3d0a514602d57005b60276004356046565b60006000f35b6033603d565b8060005260206000f35b600060e1905090565b80600160a060020a0316ff5056",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsCreate4ContractsFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsCreate4ContractsFiller.json
index 47cc179fb..3daad5e81 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsCreate4ContractsFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsCreate4ContractsFiller.json
@@ -94,47 +94,47 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000000000000000000",
-		"//comment1" : "contract recursiveCreate1",
-		"//comment2" : "{",
-		"//comment3" : "    uint depp;",
-		"//comment4" : "    function recursiveCreate1(address a, uint depth)",
-		"//comment5" : "    {",
-		"//comment6" : "        depth = depth - 1;",
-		"//comment7" : "depp = depth;",
-		"//comment8" : "        if(depth > 0)",
-		"//comment9" : "            main(a).create2(depth);",
-		"//comment10" : "    }",
-		"//comment11" : "}",
-		"//comment12" : "",
-		"//comment13" : "contract recursiveCreate2",
-		"//comment14" : "{",
-		"//comment15" : "    uint depp;",
-		"//comment16" : "    function recursiveCreate2(address a, uint depth)",
-		"//comment17" : "    {",
-		"//comment18" : "        depth = depth - 1;",
-		"//comment19" : "depp = depth;",
-		"//comment20" : "        if(depth > 0)",
-		"//comment21" : "            recursiveCreate1 rec1 = new recursiveCreate1(a, depth);",
-		"//comment22" : "    }",
-		"//comment23" : "}",
-		"//comment24" : "",
-		"//comment25" : "contract main",
-		"//comment26" : "{",
-		"//comment27" : "    address maincontract;",
-		"//comment28" : "    uint depp;",
-		"//comment29" : "    function run(uint depth)",
-		"//comment30" : "    {",
-		"//comment31" : "        maincontract = 0x095e7baea6a6c7c4c2dfeb977efac326af552d87;",
-		"//comment32" : "        depp = depth;",
-		"//comment33" : "        recursiveCreate1 rec1 = new recursiveCreate1(maincontract, depth);",
-		"//comment34" : "    }",
-		"//comment35" : "",
-		"//comment36" : "    function create2(uint depth)",
-		"//comment37" : "    {",
-		"//comment38" : "        recursiveCreate2 rec2 = new recursiveCreate2(maincontract, depth);",
-		"//comment39" : "        address(rec2).send(2);",
-		"//comment40" : "    }",
-		"//comment41" : "}",
+                "//comment1" : "contract recursiveCreate1",
+                "//comment2" : "{",
+                "//comment3" : "    uint depp;",
+                "//comment4" : "    function recursiveCreate1(address a, uint depth)",
+                "//comment5" : "    {",
+                "//comment6" : "        depth = depth - 1;",
+                "//comment7" : "depp = depth;",
+                "//comment8" : "        if(depth > 0)",
+                "//comment9" : "            main(a).create2(depth);",
+                "//comment10" : "    }",
+                "//comment11" : "}",
+                "//comment12" : "",
+                "//comment13" : "contract recursiveCreate2",
+                "//comment14" : "{",
+                "//comment15" : "    uint depp;",
+                "//comment16" : "    function recursiveCreate2(address a, uint depth)",
+                "//comment17" : "    {",
+                "//comment18" : "        depth = depth - 1;",
+                "//comment19" : "depp = depth;",
+                "//comment20" : "        if(depth > 0)",
+                "//comment21" : "            recursiveCreate1 rec1 = new recursiveCreate1(a, depth);",
+                "//comment22" : "    }",
+                "//comment23" : "}",
+                "//comment24" : "",
+                "//comment25" : "contract main",
+                "//comment26" : "{",
+                "//comment27" : "    address maincontract;",
+                "//comment28" : "    uint depp;",
+                "//comment29" : "    function run(uint depth)",
+                "//comment30" : "    {",
+                "//comment31" : "        maincontract = 0x095e7baea6a6c7c4c2dfeb977efac326af552d87;",
+                "//comment32" : "        depp = depth;",
+                "//comment33" : "        recursiveCreate1 rec1 = new recursiveCreate1(maincontract, depth);",
+                "//comment34" : "    }",
+                "//comment35" : "",
+                "//comment36" : "    function create2(uint depth)",
+                "//comment37" : "    {",
+                "//comment38" : "        recursiveCreate2 rec2 = new recursiveCreate2(maincontract, depth);",
+                "//comment39" : "        address(rec2).send(2);",
+                "//comment40" : "    }",
+                "//comment41" : "}",
                 "code" : "0x60003560e060020a90048063820b13f614610021578063a444f5e91461003257005b61002c600435610093565b60006000f35b61003d600435610043565b60006000f35b600073095e7baea6a6c7c4c2dfeb977efac326af552d8760008190555081600181905550606b6101ad600039606b600054600160a060020a0316815260200182815260200160006000f090505050565b600060c86100e560003960c8600054600160a060020a0316815260200182815260200160006000f0905080600160a060020a0316600060026000600060006000848787f16100dd57005b50505050505600604060c860043960045160245160006001820391508160008190555060008211602657604c565b606b605d600039606b83600160a060020a0316815260200182815260200160006000f090505b505050600180605c6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f30000",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsFiller.json
index d253ff969..2ca3857a2 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsFiller.json
@@ -86,47 +86,47 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000000000000000000",
-		"//comment1" : "contract recursiveCreate1",
-		"//comment2" : "{",
-		"//comment3" : "    uint depp;",
-		"//comment4" : "    function recursiveCreate1(address a, uint depth)",
-		"//comment5" : "    {",
-		"//comment6" : "        depth = depth - 1;",
-		"//comment7" : "depp = depth;",
-		"//comment8" : "        if(depth > 0)",
-		"//comment9" : "            main(a).create2(depth);",
-		"//comment10" : "    }",
-		"//comment11" : "}",
-		"//comment12" : "",
-		"//comment13" : "contract recursiveCreate2",
-		"//comment14" : "{",
-		"//comment15" : "    uint depp;",
-		"//comment16" : "    function recursiveCreate2(address a, uint depth)",
-		"//comment17" : "    {",
-		"//comment18" : "        depth = depth - 1;",
-		"//comment19" : "depp = depth;",
-		"//comment20" : "        if(depth > 0)",
-		"//comment21" : "            recursiveCreate1 rec1 = new recursiveCreate1(a, depth);",
-		"//comment22" : "    }",
-		"//comment23" : "}",
-		"//comment24" : "",
-		"//comment25" : "contract main",
-		"//comment26" : "{",
-		"//comment27" : "    address maincontract;",
-		"//comment28" : "    uint depp;",
-		"//comment29" : "    function run(uint depth)",
-		"//comment30" : "    {",
-		"//comment31" : "        maincontract = 0x095e7baea6a6c7c4c2dfeb977efac326af552d87;",
-		"//comment32" : "        depp = depth;",
-		"//comment33" : "        recursiveCreate1 rec1 = new recursiveCreate1(maincontract, depth);",
-		"//comment34" : "    }",
-		"//comment35" : "",
-		"//comment36" : "    function create2(uint depth)",
-		"//comment37" : "    {",
-		"//comment38" : "        recursiveCreate2 rec2 = new recursiveCreate2(maincontract, depth);",
-		"//comment39" : "        address(rec2).send(2);",
-		"//comment40" : "    }",
-		"//comment41" : "}",
+                "//comment1" : "contract recursiveCreate1",
+                "//comment2" : "{",
+                "//comment3" : "    uint depp;",
+                "//comment4" : "    function recursiveCreate1(address a, uint depth)",
+                "//comment5" : "    {",
+                "//comment6" : "        depth = depth - 1;",
+                "//comment7" : "depp = depth;",
+                "//comment8" : "        if(depth > 0)",
+                "//comment9" : "            main(a).create2(depth);",
+                "//comment10" : "    }",
+                "//comment11" : "}",
+                "//comment12" : "",
+                "//comment13" : "contract recursiveCreate2",
+                "//comment14" : "{",
+                "//comment15" : "    uint depp;",
+                "//comment16" : "    function recursiveCreate2(address a, uint depth)",
+                "//comment17" : "    {",
+                "//comment18" : "        depth = depth - 1;",
+                "//comment19" : "depp = depth;",
+                "//comment20" : "        if(depth > 0)",
+                "//comment21" : "            recursiveCreate1 rec1 = new recursiveCreate1(a, depth);",
+                "//comment22" : "    }",
+                "//comment23" : "}",
+                "//comment24" : "",
+                "//comment25" : "contract main",
+                "//comment26" : "{",
+                "//comment27" : "    address maincontract;",
+                "//comment28" : "    uint depp;",
+                "//comment29" : "    function run(uint depth)",
+                "//comment30" : "    {",
+                "//comment31" : "        maincontract = 0x095e7baea6a6c7c4c2dfeb977efac326af552d87;",
+                "//comment32" : "        depp = depth;",
+                "//comment33" : "        recursiveCreate1 rec1 = new recursiveCreate1(maincontract, depth);",
+                "//comment34" : "    }",
+                "//comment35" : "",
+                "//comment36" : "    function create2(uint depth)",
+                "//comment37" : "    {",
+                "//comment38" : "        recursiveCreate2 rec2 = new recursiveCreate2(maincontract, depth);",
+                "//comment39" : "        address(rec2).send(2);",
+                "//comment40" : "    }",
+                "//comment41" : "}",
                 "code" : "0x60003560e060020a90048063820b13f614610021578063a444f5e91461003257005b61002c600435610093565b60006000f35b61003d600435610043565b60006000f35b600073095e7baea6a6c7c4c2dfeb977efac326af552d8760008190555081600181905550606b6101ad600039606b600054600160a060020a0316815260200182815260200160006000f090505050565b600060c86100e560003960c8600054600160a060020a0316815260200182815260200160006000f0905080600160a060020a0316600060026000600060006000848787f16100dd57005b50505050505600604060c860043960045160245160006001820391508160008190555060008211602657604c565b606b605d600039606b83600160a060020a0316815260200182815260200160006000f090505b505050600180605c6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f30000",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSolidityTest/TestBlockAndTransactionPropertiesFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/TestBlockAndTransactionPropertiesFiller.json
index 66fe584ca..7c4d51b28 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/TestBlockAndTransactionPropertiesFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/TestBlockAndTransactionPropertiesFiller.json
@@ -28,49 +28,49 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//comment1" : "contract main",
-		"//comment2" : "{",
-		"//comment3" : "    bool returnValue;",
-		"//comment4" : "    function run() returns (bool)",
-		"//comment5" : "    {",
-		"//comment6" : "       returnValue = testBlockAndTransactionProperties();",
-		"//comment7" : "       return returnValue;",
-		"//comment8" : "    }",
-		"//comment9" : "",
-		"//comment10" : "    function testBlockAndTransactionProperties() returns (bool res)",
-		"//comment11" : "    {",
-		"//comment12" : "        res = true;",
-		"//comment13" : "        if (block.coinbase != 0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba)",
-		"//comment14" : "            return false;",
-		"//comment15" : "",
-		"//comment16" : "        if (block.difficulty != 45678256)",
-		"//comment17" : "            return false;",
-		"//comment18" : "",
-		"//comment19" : "        if (block.gaslimit != 0x7fffffffffffffff)",
-		"//comment20" : "            return false;",
-		"//comment21" : "",
-		"//comment22" : "        if (block.number != 120)",
-		"//comment23" : "            return false;",
-		"//comment24" : "",
-		"//comment25" : "        //try to call this",
-		"//comment26" : "        block.blockhash(120);",
-		"//comment27" : "        block.timestamp;",
-		"//comment28" : "        msg.gas;",
-		"//comment29" : "",
-		"//comment30" : "        if (msg.sender != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)",
-		"//comment31" : "            return false;",
-		"//comment32" : "",
-		"//comment33" : "        if (msg.value != 100)",
-		"//comment34" : "            return false;",
-		"//comment35" : "",
-		"//comment36" : "        if (tx.gasprice != 1)",
-		"//comment37" : "            return false;",
-		"//comment38" : "",
-		"//comment39" : "        if (tx.origin != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)",
-		"//comment40" : "            return false;",
-		"//comment41" : "",
-		"//comment42" : "    }",
-		"//comment43" : "}",
+                "//comment1" : "contract main",
+                "//comment2" : "{",
+                "//comment3" : "    bool returnValue;",
+                "//comment4" : "    function run() returns (bool)",
+                "//comment5" : "    {",
+                "//comment6" : "       returnValue = testBlockAndTransactionProperties();",
+                "//comment7" : "       return returnValue;",
+                "//comment8" : "    }",
+                "//comment9" : "",
+                "//comment10" : "    function testBlockAndTransactionProperties() returns (bool res)",
+                "//comment11" : "    {",
+                "//comment12" : "        res = true;",
+                "//comment13" : "        if (block.coinbase != 0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba)",
+                "//comment14" : "            return false;",
+                "//comment15" : "",
+                "//comment16" : "        if (block.difficulty != 45678256)",
+                "//comment17" : "            return false;",
+                "//comment18" : "",
+                "//comment19" : "        if (block.gaslimit != 0x7fffffffffffffff)",
+                "//comment20" : "            return false;",
+                "//comment21" : "",
+                "//comment22" : "        if (block.number != 120)",
+                "//comment23" : "            return false;",
+                "//comment24" : "",
+                "//comment25" : "        //try to call this",
+                "//comment26" : "        block.blockhash(120);",
+                "//comment27" : "        block.timestamp;",
+                "//comment28" : "        msg.gas;",
+                "//comment29" : "",
+                "//comment30" : "        if (msg.sender != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)",
+                "//comment31" : "            return false;",
+                "//comment32" : "",
+                "//comment33" : "        if (msg.value != 100)",
+                "//comment34" : "            return false;",
+                "//comment35" : "",
+                "//comment36" : "        if (tx.gasprice != 1)",
+                "//comment37" : "            return false;",
+                "//comment38" : "",
+                "//comment39" : "        if (tx.origin != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)",
+                "//comment40" : "            return false;",
+                "//comment41" : "",
+                "//comment42" : "    }",
+                "//comment43" : "}",
                 "code" : "0x60606040526000357c010000000000000000000000000000000000000000000000000000000090048063c040622614610044578063e97384dc1461006957610042565b005b610051600480505061008e565b60405180821515815260200191505060405180910390f35b61007660048050506100c9565b60405180821515815260200191505060405180910390f35b60006100986100c9565b600060006101000a81548160ff02191690830217905550600060009054906101000a900460ff1690506100c6565b90565b6000600190508050732adc25665018aa1fe0e6bc666dac8fc2697ff9ba4173ffffffffffffffffffffffffffffffffffffffff1614151561010d57600090506101f7565b6302b8feb04414151561012357600090506101f7565b677fffffffffffffff4514151561013d57600090506101f7565b60784314151561015057600090506101f7565b6078405042505a5073a94f5374fce5edbc8e2a8697c15331677e6ebf0b3373ffffffffffffffffffffffffffffffffffffffff1614151561019457600090506101f7565b6064341415156101a757600090506101f7565b60013a1415156101ba57600090506101f7565b73a94f5374fce5edbc8e2a8697c15331677e6ebf0b3273ffffffffffffffffffffffffffffffffffffffff161415156101f657600090506101f7565b5b9056",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSolidityTest/TestContractInteractionFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/TestContractInteractionFiller.json
index b66bbeeb2..7b540ea53 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/TestContractInteractionFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/TestContractInteractionFiller.json
@@ -29,35 +29,35 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//comment1": "contract TestContract",
-		"//comment2": "{",
-		"//comment3": "    function testMethod() returns (int res)",
-		"//comment4": "    {",
-		"//comment5": "        return 225;",
-		"//comment6": "    }",
-		"//comment7": "",
-		"//comment8": "    function destroy(address sendFoundsTo)",
-		"//comment9": "    {",
-		"//comment10": "        suicide(sendFoundsTo);",
-		"//comment11": "    }",
-		"//comment12": "}",
-		"//comment13": "contract main",
-		"//comment14": "{",
-		"//comment15": "    bool returnValue;",
-		"//comment16": "    function run() returns (bool)",
-		"//comment17": "    {",
-		"//comment18": "       returnValue = testContractInteraction();",
-		"//comment19": "       return returnValue;",
-		"//comment20": "    }",
-		"//comment21": "",
-		"//comment22" : "    function testContractInteraction() returns (bool res)",
-		"//comment23" : "    {",
-		"//comment24" : "        TestContract a = new TestContract();",
-		"//comment25" : "        if (a.testMethod() == 225)",
-		"//comment26" : "            return true;",
-		"//comment27" : "        return false;",
-		"//comment28" : "    }",
-		"//comment29": "}",
+                "//comment1": "contract TestContract",
+                "//comment2": "{",
+                "//comment3": "    function testMethod() returns (int res)",
+                "//comment4": "    {",
+                "//comment5": "        return 225;",
+                "//comment6": "    }",
+                "//comment7": "",
+                "//comment8": "    function destroy(address sendFoundsTo)",
+                "//comment9": "    {",
+                "//comment10": "        suicide(sendFoundsTo);",
+                "//comment11": "    }",
+                "//comment12": "}",
+                "//comment13": "contract main",
+                "//comment14": "{",
+                "//comment15": "    bool returnValue;",
+                "//comment16": "    function run() returns (bool)",
+                "//comment17": "    {",
+                "//comment18": "       returnValue = testContractInteraction();",
+                "//comment19": "       return returnValue;",
+                "//comment20": "    }",
+                "//comment21": "",
+                "//comment22" : "    function testContractInteraction() returns (bool res)",
+                "//comment23" : "    {",
+                "//comment24" : "        TestContract a = new TestContract();",
+                "//comment25" : "        if (a.testMethod() == 225)",
+                "//comment26" : "            return true;",
+                "//comment27" : "        return false;",
+                "//comment28" : "    }",
+                "//comment29": "}",
                 "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463c04062268114610039578063ed973fe91461004b57005b6100416100ea565b8060005260206000f35b61005361005d565b8060005260206000f35b60006000608161011a600039608160006000f0905073ffffffffffffffffffffffffffffffffffffffff811663b9c3d0a5602060007fb9c3d0a50000000000000000000000000000000000000000000000000000000081526004600060008660325a03f16100c757005b505060005160e1146100d8576100e1565b600191506100e6565b600091505b5090565b60006100f461005d565b600060006101000a81548160ff0219169083021790555060ff600160005404169050905600607580600c6000396000f3007c01000000000000000000000000000000000000000000000000000000006000350462f55d9d81146036578063b9c3d0a514604557005b603f6004356055565b60006000f35b604b6070565b8060005260206000f35b8073ffffffffffffffffffffffffffffffffffffffff16ff50565b60e19056",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSolidityTest/TestContractSuicideFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/TestContractSuicideFiller.json
index c4cf495a8..5c37c33fd 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/TestContractSuicideFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/TestContractSuicideFiller.json
@@ -29,36 +29,36 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//comment1": "contract TestContract",
-		"//comment2": "{",
-		"//comment3": "    function testMethod() returns (int res)",
-		"//comment4": "    {",
-		"//comment5": "        return 225;",
-		"//comment6": "    }",
-		"//comment7": "",
-		"//comment8": "    function destroy(address sendFoundsTo)",
-		"//comment9": "    {",
-		"//comment10": "        suicide(sendFoundsTo);",
-		"//comment11": "    }",
-		"//comment12": "}",
-		"//comment13": "contract main",
-		"//comment14": "{",
-		"//comment15": "   bool returnValue;",
-		"//comment16": "    function run() returns (bool)",
-		"//comment17": "    {",
-		"//comment18": "       returnValue = testContractSuicide();",
-		"//comment19": "       return returnValue;",
-		"//comment20": "    }",
-		"//comment21": "",
-		"//comment22": "    function testContractSuicide() returns (bool res)",
-		"//comment23": "    {",
-		"//comment24": "        TestContract a = new TestContract();",
-		"//comment25": "        a.destroy(block.coinbase);",
-		"//comment26": "        if (a.testMethod() == 225) //we should be able to call a contract",
-		"//comment27": "            return true;",
-		"//comment28": "        return false;",
-		"//comment29": "    }",
-		"//comment30": "}",
+                "//comment1": "contract TestContract",
+                "//comment2": "{",
+                "//comment3": "    function testMethod() returns (int res)",
+                "//comment4": "    {",
+                "//comment5": "        return 225;",
+                "//comment6": "    }",
+                "//comment7": "",
+                "//comment8": "    function destroy(address sendFoundsTo)",
+                "//comment9": "    {",
+                "//comment10": "        suicide(sendFoundsTo);",
+                "//comment11": "    }",
+                "//comment12": "}",
+                "//comment13": "contract main",
+                "//comment14": "{",
+                "//comment15": "   bool returnValue;",
+                "//comment16": "    function run() returns (bool)",
+                "//comment17": "    {",
+                "//comment18": "       returnValue = testContractSuicide();",
+                "//comment19": "       return returnValue;",
+                "//comment20": "    }",
+                "//comment21": "",
+                "//comment22": "    function testContractSuicide() returns (bool res)",
+                "//comment23": "    {",
+                "//comment24": "        TestContract a = new TestContract();",
+                "//comment25": "        a.destroy(block.coinbase);",
+                "//comment26": "        if (a.testMethod() == 225) //we should be able to call a contract",
+                "//comment27": "            return true;",
+                "//comment28": "        return false;",
+                "//comment29": "    }",
+                "//comment30": "}",
                 "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463a60eedda8114610039578063c04062261461004b57005b61004161005d565b8060005260206000f35b61005361015a565b8060005260206000f35b60006000608161018a600039608160006000f0905073ffffffffffffffffffffffffffffffffffffffff811662f55d9d6000807ef55d9d00000000000000000000000000000000000000000000000000000000825260044173ffffffffffffffffffffffffffffffffffffffff168152602001600060008660325a03f16100e057005b505073ffffffffffffffffffffffffffffffffffffffff811663b9c3d0a5602060007fb9c3d0a50000000000000000000000000000000000000000000000000000000081526004600060008660325a03f161013757005b505060005160e11461014857610151565b60019150610156565b600091505b5090565b600061016461005d565b600060006101000a81548160ff0219169083021790555060ff600160005404169050905600607580600c6000396000f3007c01000000000000000000000000000000000000000000000000000000006000350462f55d9d81146036578063b9c3d0a514604557005b603f600435605a565b60006000f35b604b6055565b8060005260206000f35b60e190565b8073ffffffffffffffffffffffffffffffffffffffff16ff5056",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSolidityTest/TestCryptographicFunctionsFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/TestCryptographicFunctionsFiller.json
index 1e557f2a8..75c7b8f5b 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/TestCryptographicFunctionsFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/TestCryptographicFunctionsFiller.json
@@ -28,34 +28,34 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//comment1" : "contract main",
-		"//comment2" : "{",
-		"//comment3" : "    bool returnValue;",
-		"//comment4" : "    function run() returns (bool)",
-		"//comment5" : "    {",
-		"//comment6" : "       returnValue = testCryptographicFunctions();",
-		"//comment7" : "       return returnValue;",
-		"//comment8" : "    }",
-		"//comment9" : "",
-		"//comment10" : "    function testCryptographicFunctions() returns (bool res)",
-		"//comment11" : "    {",
-		"//comment12" : "        res = true;",
-		"//comment13" : "        if (sha3('teststring') != 0x43c4b4524adb81e4e9a5c4648a98e9d320e3908ac5b6c889144b642cd08ae16d)",
-		"//comment14" : "            return false;",
-		"//comment15" : "",
-		"//comment16" : "        if (sha256('teststring') != 0x3c8727e019a42b444667a587b6001251becadabbb36bfed8087a92c18882d111)",
-		"//comment17" : "            return false;",
-		"//comment18" : "",
-		"//comment19" : "        if (ripemd160('teststring') != 0xcd566972b5e50104011a92b59fa8e0b1234851ae)",
-		"//comment20" : "            return false;",
-		"//comment21" : "",
-		"//comment22" : "if (ecrecover(0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c,",
-		"//comment23" : "                      28, 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f,",
-		"//comment24" : "                      0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549)",
-		"//comment25" : "                      != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)",
-		"//comment26" : "        return false;",
-		"//comment27" : "    }",
-		"//comment28" : "}",
+                "//comment1" : "contract main",
+                "//comment2" : "{",
+                "//comment3" : "    bool returnValue;",
+                "//comment4" : "    function run() returns (bool)",
+                "//comment5" : "    {",
+                "//comment6" : "       returnValue = testCryptographicFunctions();",
+                "//comment7" : "       return returnValue;",
+                "//comment8" : "    }",
+                "//comment9" : "",
+                "//comment10" : "    function testCryptographicFunctions() returns (bool res)",
+                "//comment11" : "    {",
+                "//comment12" : "        res = true;",
+                "//comment13" : "        if (sha3('teststring') != 0x43c4b4524adb81e4e9a5c4648a98e9d320e3908ac5b6c889144b642cd08ae16d)",
+                "//comment14" : "            return false;",
+                "//comment15" : "",
+                "//comment16" : "        if (sha256('teststring') != 0x3c8727e019a42b444667a587b6001251becadabbb36bfed8087a92c18882d111)",
+                "//comment17" : "            return false;",
+                "//comment18" : "",
+                "//comment19" : "        if (ripemd160('teststring') != 0xcd566972b5e50104011a92b59fa8e0b1234851ae)",
+                "//comment20" : "            return false;",
+                "//comment21" : "",
+                "//comment22" : "if (ecrecover(0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c,",
+                "//comment23" : "                      28, 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f,",
+                "//comment24" : "                      0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549)",
+                "//comment25" : "                      != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)",
+                "//comment26" : "        return false;",
+                "//comment27" : "    }",
+                "//comment28" : "}",
                 "code" : "0x6000357c010000000000000000000000000000000000000000000000000000000090048063c04062261461003a578063e0a9fd281461004c57005b61004261005e565b8060005260206000f35b610054610099565b8060005260206000f35b6000610068610099565b600060006101000a81548160ff02191690830217905550600060009054906101000a900460ff169050610096565b90565b60006001905080507f43c4b4524adb81e4e9a5c4648a98e9d320e3908ac5b6c889144b642cd08ae16d60010260407f74657374737472696e67000000000000000000000000000000000000000000008152600a016040900360402014156100ff57610108565b600090506102ec565b7f3c8727e019a42b444667a587b6001251becadabbb36bfed8087a92c18882d11160010260026020600060007f74657374737472696e67000000000000000000000000000000000000000000008152600a0160006000856161da5a03f161016b57005b50600051141561017a57610183565b600090506102ec565b73cd566972b5e50104011a92b59fa8e0b1234851ae6c010000000000000000000000000260036020600060007f74657374737472696e67000000000000000000000000000000000000000000008152600a0160006000856161da5a03f16101e657005b506000516c010000000000000000000000000214156102045761020d565b600090506102ec565b73a94f5374fce5edbc8e2a8697c15331677e6ebf0b60016020600060007f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c6001028152602001601c81526020017f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f60010281526020017feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549600102815260200160006000856161da5a03f16102bd57005b5060005173ffffffffffffffffffffffffffffffffffffffff1614156102e2576102eb565b600090506102ec565b5b9056",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSolidityTest/TestKeywordsFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/TestKeywordsFiller.json
index 4af87bcc6..06130ed2a 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/TestKeywordsFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/TestKeywordsFiller.json
@@ -28,49 +28,49 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//comment1": "contract main",
-		"//comment2": "{",
-		"//comment3": "    bool returnValue;",
-		"//comment4": "    function run() returns (bool)",
-		"//comment5": "    {",
-		"//comment6": "       returnValue = testKeywords();",
-		"//comment7": "       return returnValue;",
-		"//comment8": "    }",
-		"//comment9": "",
-		"//comment10": "    function testKeywords() returns (bool res)",
-		"//comment11": "    {",
-		"//comment12": "        //some simple checks for the if statemnt",
-		"//comment13": "        //if, else, while, for, break, continue, return",
-		"//comment14": "        int i = 0;",
-		"//comment15": "        res = false;",
-		"//comment16": "",
-		"//comment17": "        if (i == 0)",
-		"//comment18": "        {",
-		"//comment19": "            if( i <= -25)",
-		"//comment20": "            {",
-		"//comment21": "                return false;",
-		"//comment22": "            }",
-		"//comment23": "            else",
-		"//comment24": "            {",
-		"//comment25": "                while(i < 10)",
-		"//comment26": "                    i++;",
-		"//comment27": "",
-		"//comment28": "                if (i == 10)",
-		"//comment29": "                {",
-		"//comment30": "                    for(var j=10; j>0; j--)",
-		"//comment31": "                    {",
-		"//comment32": "                        i--;",
-		"//comment33": "                    }",
-		"//comment34": "                }",
-		"//comment35": "            }",
-		"//comment36": "        }",
-		"//comment37": "",
-		"//comment38": "        if (i == 0)",
-		"//comment39": "            return true;",
-		"//comment40": "",
-		"//comment41": "        return false;",
-		"//comment42": "    }",
-		"//comment43": "}",
+                "//comment1": "contract main",
+                "//comment2": "{",
+                "//comment3": "    bool returnValue;",
+                "//comment4": "    function run() returns (bool)",
+                "//comment5": "    {",
+                "//comment6": "       returnValue = testKeywords();",
+                "//comment7": "       return returnValue;",
+                "//comment8": "    }",
+                "//comment9": "",
+                "//comment10": "    function testKeywords() returns (bool res)",
+                "//comment11": "    {",
+                "//comment12": "        //some simple checks for the if statemnt",
+                "//comment13": "        //if, else, while, for, break, continue, return",
+                "//comment14": "        int i = 0;",
+                "//comment15": "        res = false;",
+                "//comment16": "",
+                "//comment17": "        if (i == 0)",
+                "//comment18": "        {",
+                "//comment19": "            if( i <= -25)",
+                "//comment20": "            {",
+                "//comment21": "                return false;",
+                "//comment22": "            }",
+                "//comment23": "            else",
+                "//comment24": "            {",
+                "//comment25": "                while(i < 10)",
+                "//comment26": "                    i++;",
+                "//comment27": "",
+                "//comment28": "                if (i == 10)",
+                "//comment29": "                {",
+                "//comment30": "                    for(var j=10; j>0; j--)",
+                "//comment31": "                    {",
+                "//comment32": "                        i--;",
+                "//comment33": "                    }",
+                "//comment34": "                }",
+                "//comment35": "            }",
+                "//comment36": "        }",
+                "//comment37": "",
+                "//comment38": "        if (i == 0)",
+                "//comment39": "            return true;",
+                "//comment40": "",
+                "//comment41": "        return false;",
+                "//comment42": "    }",
+                "//comment43": "}",
                 "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463380e439681146037578063c040622614604757005b603d6084565b8060005260206000f35b604d6057565b8060005260206000f35b6000605f6084565b600060006101000a81548160ff0219169083021790555060ff60016000540416905090565b6000808160011560cd575b600a82121560a157600190910190608f565b81600a1460ac5760c9565b50600a5b60008160ff16111560c85760019182900391900360b0565b5b60d5565b6000925060ed565b8160001460e05760e8565b6001925060ed565b600092505b50509056",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSolidityTest/TestOverflowFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/TestOverflowFiller.json
index b7362d019..e2ca8da4c 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/TestOverflowFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/TestOverflowFiller.json
@@ -28,31 +28,31 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//comment1" : "contract main",
-		"//comment2" : "{",
-		"//comment3" : "    bool returnValue;",
-		"//comment4" : "    function run() returns (bool)",
-		"//comment5" : "    {",
-		"//comment6" : "       returnValue = testOverflow();",
-		"//comment7" : "       return returnValue;",
-		"//comment8" : "    }",
-		"//comment9" : "",
-		"//comment10" : "    function testOverflow() returns (bool res)",
-		"//comment11" : "    {",
-		"//comment12" : "        res = true;",
-		"//comment13" : "        uint256 a = 115792089237316195423570985008687907853269984665640564039457584007913129639935;",
-		"//comment14" : "        if (a + 1 != 0)",
-		"//comment15" : "            return false;",
-		"//comment16" : "",
-		"//comment17" : "        uint32 b = 4294967295;",
-		"//comment18" : "        if (b + 1 != 0)",
-		"//comment19" : "            return false;",
-		"//comment20" : "",
-		"//comment21" : "        uint64 c = 18446744073709551615;",
-		"//comment22" : "        if (c + 1 != 0)",
-		"//comment23" : "            return false;",
-		"//comment24" : "    }",
-		"//comment25" : "}",
+                "//comment1" : "contract main",
+                "//comment2" : "{",
+                "//comment3" : "    bool returnValue;",
+                "//comment4" : "    function run() returns (bool)",
+                "//comment5" : "    {",
+                "//comment6" : "       returnValue = testOverflow();",
+                "//comment7" : "       return returnValue;",
+                "//comment8" : "    }",
+                "//comment9" : "",
+                "//comment10" : "    function testOverflow() returns (bool res)",
+                "//comment11" : "    {",
+                "//comment12" : "        res = true;",
+                "//comment13" : "        uint256 a = 115792089237316195423570985008687907853269984665640564039457584007913129639935;",
+                "//comment14" : "        if (a + 1 != 0)",
+                "//comment15" : "            return false;",
+                "//comment16" : "",
+                "//comment17" : "        uint32 b = 4294967295;",
+                "//comment18" : "        if (b + 1 != 0)",
+                "//comment19" : "            return false;",
+                "//comment20" : "",
+                "//comment21" : "        uint64 c = 18446744073709551615;",
+                "//comment22" : "        if (c + 1 != 0)",
+                "//comment23" : "            return false;",
+                "//comment24" : "    }",
+                "//comment25" : "}",
                 "code" : "0x6000357c0100000000000000000000000000000000000000000000000000000000900480638040cac41461003a578063c04062261461004c57005b610042610099565b8060005260206000f35b61005461005e565b8060005260206000f35b6000610068610099565b600060006101000a81548160ff02191690830217905550600060009054906101000a900460ff169050610096565b90565b60006000600060006001935083507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff925060006001840114156100db576100e4565b6000935061013b565b63ffffffff915060006001830163ffffffff1614156101025761010b565b6000935061013b565b67ffffffffffffffff905060006001820167ffffffffffffffff1614156101315761013a565b6000935061013b565b5b5050509056",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSolidityTest/TestStoreGasPricesFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/TestStoreGasPricesFiller.json
index 3ec40b75c..4a7e1e5b0 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/TestStoreGasPricesFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/TestStoreGasPricesFiller.json
@@ -40,34 +40,34 @@
 		"//comment5" : "  function run() returns (bool)",
 		"//comment6" : "  {",
 		"//comment7" : "     uint startgas = msg.gas;",
-		"//comment8" : "",
-		"//comment9" : "     storage = 1;  //zero to non zero",
-		"//comment10" : "     m_gasUsed[0] = startgas - msg.gas;",
-		"//comment11" : "     startgas = msg.gas;",
-		"//comment12" : "",
-		"//comment13" : "     storage = 2;  //non zero to non zero",
-		"//comment14" : "     m_gasUsed[1] = startgas - msg.gas;",
-		"//comment15" : "     startgas = msg.gas;",
-		"//comment16" : "",
-		"//comment17" : "     storage = 2;  //non zero to same non zero",
-		"//comment18" : "     m_gasUsed[2] = startgas - msg.gas;",
-		"//comment19" : "     startgas = msg.gas;",
-		"//comment20" : "",
-		"//comment21" : "     storage = 24784793845734;  //non zero to huge non zero",
-		"//comment22" : "     m_gasUsed[3] = startgas - msg.gas;",
-		"//comment23" : "     startgas = msg.gas;",
-		"//comment24" : "",
-		"//comment25" : "     storage = 2;  //huge non zero to non zero",
-		"//comment26" : "     m_gasUsed[4] = startgas - msg.gas;",
-		"//comment27" : "     startgas = msg.gas;",
-		"//comment28" : "",
-		"//comment29" : "     storage = 0;  //non zero to zero",
-		"//comment30" : "     m_gasUsed[5] = startgas - msg.gas;",
-		"//comment31" : "     startgas = msg.gas;",
-		"//comment32" : "",
-		"//comment33" : "     return true;",
-		"//comment34" : "  }",
-		"//comment35" : "}",
+                "//comment8" : "",
+                "//comment9" : "     storage = 1;  //zero to non zero",
+                "//comment10" : "     m_gasUsed[0] = startgas - msg.gas;",
+                "//comment11" : "     startgas = msg.gas;",
+                "//comment12" : "",
+                "//comment13" : "     storage = 2;  //non zero to non zero",
+                "//comment14" : "     m_gasUsed[1] = startgas - msg.gas;",
+                "//comment15" : "     startgas = msg.gas;",
+                "//comment16" : "",
+                "//comment17" : "     storage = 2;  //non zero to same non zero",
+                "//comment18" : "     m_gasUsed[2] = startgas - msg.gas;",
+                "//comment19" : "     startgas = msg.gas;",
+                "//comment20" : "",
+                "//comment21" : "     storage = 24784793845734;  //non zero to huge non zero",
+                "//comment22" : "     m_gasUsed[3] = startgas - msg.gas;",
+                "//comment23" : "     startgas = msg.gas;",
+                "//comment24" : "",
+                "//comment25" : "     storage = 2;  //huge non zero to non zero",
+                "//comment26" : "     m_gasUsed[4] = startgas - msg.gas;",
+                "//comment27" : "     startgas = msg.gas;",
+                "//comment28" : "",
+                "//comment29" : "     storage = 0;  //non zero to zero",
+                "//comment30" : "     m_gasUsed[5] = startgas - msg.gas;",
+                "//comment31" : "     startgas = msg.gas;",
+                "//comment32" : "",
+                "//comment33" : "     return true;",
+                "//comment34" : "  }",
+                "//comment35" : "}",
                 "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463c04062268114602d57005b6033603d565b8060005260206000f35b600060005a600160205590505a81036000555a600260205590505a81036001555a600260205590505a81036002555a65168aa8d53fe660205590505a81036003555a600260205590505a81036004555a600060205590505a81036005555a5060019291505056",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSolidityTest/TestStructuresAndVariablessFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/TestStructuresAndVariablessFiller.json
index 53ef8cc9e..660192164 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/TestStructuresAndVariablessFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/TestStructuresAndVariablessFiller.json
@@ -33,49 +33,49 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//comment1" : "contract main",
-		"//comment2" : "{",
-		"//comment3" : "    struct StructTest",
-		"//comment4" : "    {",
-		"//comment5" : "        address addr;",
-		"//comment6" : "        int amount;",
-		"//comment7" : "        bytes32 str;",
-		"//comment8" : "        mapping (uint => address) funders;",
-		"//comment9" : "    }",
-		"//comment10" : "",
-		"//comment11" : "    bool returnValue;",
-		"//comment12" : "    int globalValue;",
-		"//comment13" : "    StructTest globalData;",
-		"//comment14" : "    function run() returns (bool)",
-		"//comment15" : "    {",
-		"//comment16" : "        globalValue = 255;",
-		"//comment17" : "        globalData.addr = 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b;",
-		"//comment18" : "        globalData.amount = 255;",
-		"//comment19" : "        globalData.str = 'global data 32 length string';",
-		"//comment20" : "        globalData.funders[0] = 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b;",
-		"//comment21" : "        returnValue = testStructuresAndVariabless();",
-		"//comment22" : "        return returnValue;",
-		"//comment23" : "    }",
-		"//comment24" : "",
-		"//comment25" : "    function testStructuresAndVariabless() returns (bool res)",
-		"//comment26" : "    {",
-		"//comment27" : "        res = true;",
-		"//comment28" : "        if (globalValue != 255)",
-		"//comment29" : "            return false;",
-		"//comment30" : "",
-		"//comment31" : "        if (globalValue != globalData.amount)",
-		"//comment32" : "            return false;",
-		"//comment33" : "",
-		"//comment34" : "        if (globalData.addr != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)",
-		"//comment35" : "            return false;",
-		"//comment36" : "",
-		"//comment37" : "        if (globalData.str != 'global data 32 length string')",
-		"//comment38" : "            return false;",
-		"//comment39" : "",
-		"//comment40" : "        if (globalData.funders[0] != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)",
-		"//comment41" : "            return false;",
-		"//comment42" : "    }",
-		"//comment43" : "}",
+                "//comment1" : "contract main",
+                "//comment2" : "{",
+                "//comment3" : "    struct StructTest",
+                "//comment4" : "    {",
+                "//comment5" : "        address addr;",
+                "//comment6" : "        int amount;",
+                "//comment7" : "        bytes32 str;",
+                "//comment8" : "        mapping (uint => address) funders;",
+                "//comment9" : "    }",
+                "//comment10" : "",
+                "//comment11" : "    bool returnValue;",
+                "//comment12" : "    int globalValue;",
+                "//comment13" : "    StructTest globalData;",
+                "//comment14" : "    function run() returns (bool)",
+                "//comment15" : "    {",
+                "//comment16" : "        globalValue = 255;",
+                "//comment17" : "        globalData.addr = 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b;",
+                "//comment18" : "        globalData.amount = 255;",
+                "//comment19" : "        globalData.str = 'global data 32 length string';",
+                "//comment20" : "        globalData.funders[0] = 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b;",
+                "//comment21" : "        returnValue = testStructuresAndVariabless();",
+                "//comment22" : "        return returnValue;",
+                "//comment23" : "    }",
+                "//comment24" : "",
+                "//comment25" : "    function testStructuresAndVariabless() returns (bool res)",
+                "//comment26" : "    {",
+                "//comment27" : "        res = true;",
+                "//comment28" : "        if (globalValue != 255)",
+                "//comment29" : "            return false;",
+                "//comment30" : "",
+                "//comment31" : "        if (globalValue != globalData.amount)",
+                "//comment32" : "            return false;",
+                "//comment33" : "",
+                "//comment34" : "        if (globalData.addr != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)",
+                "//comment35" : "            return false;",
+                "//comment36" : "",
+                "//comment37" : "        if (globalData.str != 'global data 32 length string')",
+                "//comment38" : "            return false;",
+                "//comment39" : "",
+                "//comment40" : "        if (globalData.funders[0] != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)",
+                "//comment41" : "            return false;",
+                "//comment42" : "    }",
+                "//comment43" : "}",
                 "code" : "0x7c010000000000000000000000000000000000000000000000000000000060003504632a9afb838114610039578063c04062261461004b57005b61004161005d565b8060005260206000f35b61005361016c565b8060005260206000f35b600160ff8154141561006e57610076565b506000610169565b60015460035414156100875761008f565b506000610169565b73a94f5374fce5edbc8e2a8697c15331677e6ebf0b73ffffffffffffffffffffffffffffffffffffffff60016002540481161614156100cd576100d5565b506000610169565b7f676c6f62616c2064617461203332206c656e67746820737472696e670000000060045414156101045761010c565b506000610169565b6005600080815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673a94f5374fce5edbc8e2a8697c15331677e6ebf0b141561016057610168565b506000610169565b5b90565b600060ff806001555073a94f5374fce5edbc8e2a8697c15331677e6ebf0b6002805473ffffffffffffffffffffffffffffffffffffffff1916821790555060ff80600355507f676c6f62616c2064617461203332206c656e67746820737472696e6700000000806004555073a94f5374fce5edbc8e2a8697c15331677e6ebf0b6005600080815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff0219169083021790555061022f61005d565b600060006101000a81548160ff0219169083021790555060ff6001600054041690509056",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLCODEFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLCODEFiller.json
index 669956da7..447f00264 100644
--- a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLCODEFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLCODEFiller.json
@@ -61,11 +61,11 @@
             },
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
-		"nonce" : "0",
-		"comment" : " Zero-value call to nonexistent account: should (i) charge only 700 gas, (ii) not create an account",
-		"code" : "{ [[0]](GAS) [[1]] (CALLCODE 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }",
-		"storage": {
-		}
+                "nonce" : "0",
+                "//comment" : " Zero-value call to nonexistent account: should (i) charge only 700 gas, (ii) not create an account",
+                "code" : "{ [[0]](GAS) [[1]] (CALLCODE 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }",
+                "storage": {
+                }
             }
         },
         "transaction" : {
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLFiller.json
index ea3952187..fd3d2c030 100644
--- a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALLFiller.json
@@ -89,11 +89,11 @@
             },
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
-		"nonce" : "0",
-		"comment" : " Zero-value call to nonexistent account: should (i) charge only 700 gas, (ii) not create an account",
-		"code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }",
-		"storage": {
-		}
+                "nonce" : "0",
+                "//comment" : " Zero-value call to nonexistent account: should (i) charge only 700 gas, (ii) not create an account",
+                "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }",
+                "storage": {
+                }
             }
         },
         "transaction" : {
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToEmptyFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToEmptyFiller.json
index a63ea92e7..beb12498d 100644
--- a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToEmptyFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToEmptyFiller.json
@@ -89,11 +89,11 @@
             },
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
-		"nonce" : "0",
-		"comment" : " Zero-value call to empty account: should (i) charge only 700 gas, (ii) delete an account",
-		"code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }",
-		"storage": {
-		}
+                "nonce" : "0",
+                "//comment" : " Zero-value call to empty account: should (i) charge only 700 gas, (ii) delete an account",
+                "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }",
+                "storage": {
+                }
             },
 	    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "",
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToNonZeroBalanceFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToNonZeroBalanceFiller.json
index e5f0e61d1..6cfc8a2fe 100644
--- a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToNonZeroBalanceFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToNonZeroBalanceFiller.json
@@ -61,11 +61,11 @@
             },
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
-		"nonce" : "0",
-		"comment" : " Zero-value call to empty account: should (i) charge only 700 gas, (ii) delete an account",
-		"code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }",
-		"storage": {
-		}
+                "nonce" : "0",
+                "//comment" : " Zero-value call to empty account: should (i) charge only 700 gas, (ii) delete an account",
+                "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }",
+                "storage": {
+                }
             },
 	    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "100",
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToOneStorageKeyFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToOneStorageKeyFiller.json
index 0c49b0185..ee6a631fe 100644
--- a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToOneStorageKeyFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_CALL_ToOneStorageKeyFiller.json
@@ -91,11 +91,11 @@
             },
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0",
-		"nonce" : "0",
-		"comment" : " Zero-value call to empty account: should (i) charge only 700 gas, (ii) delete an account",
-		"code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }",
-		"storage": {
-		}
+                "nonce" : "0",
+                "//comment" : " Zero-value call to empty account: should (i) charge only 700 gas, (ii) delete an account",
+                "code" : "{ [[0]](GAS) [[1]] (CALL 60000 0xc94f5374fce5edbc8e2a8697c15331677e6ebf0b 0 0 0 0 0) [[100]] (GAS) }",
+                "storage": {
+                }
             },
 	    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "",
diff --git a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALL_ToOneStorageKeyFiller.json b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALL_ToOneStorageKeyFiller.json
index 4a3ecc36d..7fff171e2 100644
--- a/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALL_ToOneStorageKeyFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroCallsTest/ZeroValue_TransactionCALL_ToOneStorageKeyFiller.json
@@ -30,9 +30,11 @@
                 },
                 "network" : ["Frontier", "Homestead", "EIP150"],
                 "result" : {
+		    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
 		        "storage" : {
 			    "0x00" : "0x01"
 		        }
+		    }
                 }
             }
         ],
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/pairingTestFiller.json b/src/GeneralStateTestsFiller/stZeroKnowledge/pairingTestFiller.json
index b5507b80e..b887a7353 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/pairingTestFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/pairingTestFiller.json
@@ -69,16 +69,16 @@
             },
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "",
-		"//comment1" : "zeroCash transaction data",
-		"//comment2" : "inputLength, data1, data2, data3, ...",
-		"code" : "{(MSTORE 32 (CALLDATALOAD 32)) (MSTORE 64 (CALLDATALOAD 64)) (MSTORE 96 (CALLDATALOAD 96)) (MSTORE 128 (CALLDATALOAD 128)) (MSTORE 160 (CALLDATALOAD 160)) (MSTORE 192 (CALLDATALOAD 192)) (MSTORE 224 (CALLDATALOAD 224)) (MSTORE 256 (CALLDATALOAD 256)) (MSTORE 288 (CALLDATALOAD 288)) (MSTORE 320 (CALLDATALOAD 320)) (MSTORE 352 (CALLDATALOAD 352)) (MSTORE 384 (CALLDATALOAD 384)) (MSTORE 416 (CALLDATALOAD 416)) (MSTORE 448 (CALLDATALOAD 448)) (MSTORE 480 (CALLDATALOAD 480)) (MSTORE 512 (CALLDATALOAD 512)) (MSTORE 544 (CALLDATALOAD 544)) (MSTORE 576 (CALLDATALOAD 576)) (MSTORE 608 (CALLDATALOAD 608)) (MSTORE 640 (CALLDATALOAD 640)) (MSTORE 672 (CALLDATALOAD 672)) (MSTORE 704 (CALLDATALOAD 704)) (MSTORE 736 (CALLDATALOAD 736)) [[0]](CALLCODE 500000 8 0 32 (CALLDATALOAD 0) 1000 32)  [[1]] (MLOAD 1000) }",
+                "//comment1" : "zeroCash transaction data",
+                "//comment2" : "inputLength, data1, data2, data3, ...",
+                "code" : "{(MSTORE 32 (CALLDATALOAD 32)) (MSTORE 64 (CALLDATALOAD 64)) (MSTORE 96 (CALLDATALOAD 96)) (MSTORE 128 (CALLDATALOAD 128)) (MSTORE 160 (CALLDATALOAD 160)) (MSTORE 192 (CALLDATALOAD 192)) (MSTORE 224 (CALLDATALOAD 224)) (MSTORE 256 (CALLDATALOAD 256)) (MSTORE 288 (CALLDATALOAD 288)) (MSTORE 320 (CALLDATALOAD 320)) (MSTORE 352 (CALLDATALOAD 352)) (MSTORE 384 (CALLDATALOAD 384)) (MSTORE 416 (CALLDATALOAD 416)) (MSTORE 448 (CALLDATALOAD 448)) (MSTORE 480 (CALLDATALOAD 480)) (MSTORE 512 (CALLDATALOAD 512)) (MSTORE 544 (CALLDATALOAD 544)) (MSTORE 576 (CALLDATALOAD 576)) (MSTORE 608 (CALLDATALOAD 608)) (MSTORE 640 (CALLDATALOAD 640)) (MSTORE 672 (CALLDATALOAD 672)) (MSTORE 704 (CALLDATALOAD 704)) (MSTORE 736 (CALLDATALOAD 736)) [[0]](CALLCODE 500000 8 0 32 (CALLDATALOAD 0) 1000 32)  [[1]] (MLOAD 1000) }",
                 "nonce" : "0",
                 "storage" : {
                 }
             },
 	    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "",
-		"//comment1" : "NEGATE",
+                "//comment" : "NEGATE",
                 "code" : "{ (MSTORE 0 (CALLDATALOAD 0)) (MSTORE 32 (CALLDATALOAD 32)) (MSTORE 64 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000000)  [[0]](CALLCODE 5000000 7 0 0 96 1000 64)  [[1]](MLOAD 1000) [[2]](MLOAD 1032) }",
                 "nonce" : "0",
                 "storage" : {
@@ -86,7 +86,7 @@
             },
 	    "d94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "",
-		"//comment1" : "ADD",
+                "//comment" : "ADD",
                 "code" : "{ (MSTORE 0 (CALLDATALOAD 0)) (MSTORE 32 (CALLDATALOAD 32)) (MSTORE 64 (CALLDATALOAD 64)) (MSTORE 96 (CALLDATALOAD 96)) [[0]](CALLCODE 5000000 6 0 0 128 1000 64)  [[1]](MLOAD 1000) [[2]](MLOAD 1032) }",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_0Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_21000_0Filler.json
index 6955fc481..6955fc481 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_0Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_21000_0Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_21000_128Filler.json
index b7ae654b0..b7ae654b0 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_192Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_21000_192Filler.json
index 7184c1caa..7184c1caa 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_192Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_21000_192Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_64Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_21000_64Filler.json
index 41dac488a..41dac488a 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_64Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_21000_64Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_21000_80Filler.json
index 9d84bd610..9d84bd610 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_21000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_21000_80Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_0Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_25000_0Filler.json
index f73ad46a1..f73ad46a1 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_0Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_25000_0Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_25000_128Filler.json
index 4ebc8cb5e..4ebc8cb5e 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_25000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_192Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_25000_192Filler.json
index 430b0cff2..430b0cff2 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_192Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_25000_192Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_64Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_25000_64Filler.json
index 8fd985962..8fd985962 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_64Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_25000_64Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_25000_80Filler.json
index d4d25ae63..d4d25ae63 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_0-0_25000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_0-0_25000_80Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-2_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_1-2_21000_128Filler.json
index 712068304..712068304 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-2_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_1-2_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-2_21000_192Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_1-2_21000_192Filler.json
index da0474072..da0474072 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-2_21000_192Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_1-2_21000_192Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-2_25000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_1-2_25000_128Filler.json
index 323323f3a..323323f3a 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-2_25000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_1-2_25000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-2_25000_192Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_1-2_25000_192Filler.json
index 736a997a5..736a997a5 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-2_25000_192Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_1-2_25000_192Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-3_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_1-3_21000_128Filler.json
index 0ffc71203..0ffc71203 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-3_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_1-3_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-3_25000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_1-3_25000_128Filler.json
index b1aa51d46..b1aa51d46 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-0_1-3_25000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-0_1-3_25000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-3_1-2_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-3_1-2_21000_128Filler.json
index fae3cc1a5..fae3cc1a5 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-3_1-2_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-3_1-2_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-3_1-2_25000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-3_1-2_25000_128Filler.json
index 5b1184d78..5b1184d78 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_0-3_1-2_25000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_0-3_1-2_25000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_0-0_21000_128Filler.json
index 588ec0ffc..588ec0ffc 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_0-0_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_21000_192Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_0-0_21000_192Filler.json
index 60a1d748a..60a1d748a 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_21000_192Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_0-0_21000_192Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_21000_64Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_0-0_21000_64Filler.json
index c123f2ef9..c123f2ef9 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_21000_64Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_0-0_21000_64Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_25000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_0-0_25000_128Filler.json
index 3075e43ff..3075e43ff 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_25000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_0-0_25000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_25000_192Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_0-0_25000_192Filler.json
index b0068243f..b0068243f 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_25000_192Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_0-0_25000_192Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_25000_64Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_0-0_25000_64Filler.json
index b554fd206..b554fd206 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_0-0_25000_64Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_0-0_25000_64Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_1-2_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_1-2_21000_128Filler.json
index 9aa1899e8..9aa1899e8 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_1-2_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_1-2_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_1-2_21000_192Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_1-2_21000_192Filler.json
index 441d0946f..441d0946f 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_1-2_21000_192Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_1-2_21000_192Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_1-2_25000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_1-2_25000_128Filler.json
index 2fa8768c0..2fa8768c0 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_1-2_25000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_1-2_25000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_1-2_25000_192Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_1-2_25000_192Filler.json
index 854622218..854622218 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-2_1-2_25000_192Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-2_1-2_25000_192Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-3_0-0_21000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-3_0-0_21000_80Filler.json
index 04ad54cb1..04ad54cb1 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-3_0-0_21000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-3_0-0_21000_80Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-3_0-0_25000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-3_0-0_25000_80Filler.json
index 45b7785fb..45b7785fb 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1-3_0-0_25000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1-3_0-0_25000_80Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1145-3932_1145-4651_21000_192Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1145-3932_1145-4651_21000_192Filler.json
index 5af0b551f..5af0b551f 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1145-3932_1145-4651_21000_192Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1145-3932_1145-4651_21000_192Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1145-3932_1145-4651_25000_192Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1145-3932_1145-4651_25000_192Filler.json
index 351c61f24..351c61f24 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1145-3932_1145-4651_25000_192Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1145-3932_1145-4651_25000_192Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1145-3932_2969-1336_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1145-3932_2969-1336_21000_128Filler.json
index b11395b88..b11395b88 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1145-3932_2969-1336_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1145-3932_2969-1336_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1145-3932_2969-1336_25000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1145-3932_2969-1336_25000_128Filler.json
index 4a77bdc0b..4a77bdc0b 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_1145-3932_2969-1336_25000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_1145-3932_2969-1336_25000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_6-9_19274124-124124_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_6-9_19274124-124124_21000_128Filler.json
index 0c3a60880..0c3a60880 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_6-9_19274124-124124_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_6-9_19274124-124124_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_6-9_19274124-124124_25000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_6-9_19274124-124124_25000_128Filler.json
index f633c27e0..f633c27e0 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecadd_6-9_19274124-124124_25000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecadd_6-9_19274124-124124_25000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_0Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_21000_0Filler.json
index 60ebeb904..60ebeb904 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_0Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_21000_0Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_21000_128Filler.json
index 5543dd7bd..5543dd7bd 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_40Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_21000_40Filler.json
index 627e1fa08..627e1fa08 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_40Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_21000_40Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_64Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_21000_64Filler.json
index 09810f500..09810f500 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_64Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_21000_64Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_21000_80Filler.json
index daac322e5..daac322e5 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_21000_80Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_21000_96Filler.json
index 065b12f16..065b12f16 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_21000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_0Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_28000_0Filler.json
index ccaba8a32..ccaba8a32 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_0Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_28000_0Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_28000_128Filler.json
index a8a52f576..a8a52f576 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_28000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_40Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_28000_40Filler.json
index d50901904..d50901904 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_40Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_28000_40Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_64Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_28000_64Filler.json
index aeef04694..aeef04694 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_64Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_28000_64Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_28000_80Filler.json
index aedadbd64..aedadbd64 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_28000_80Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_28000_96Filler.json
index 077ba1c02..077ba1c02 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_0_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_0_28000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_1_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_1_21000_128Filler.json
index 3fb334f2f..3fb334f2f 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_1_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_1_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_1_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_1_21000_96Filler.json
index 1ec5f2573..1ec5f2573 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_1_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_1_21000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_1_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_1_28000_128Filler.json
index 604d5288a..604d5288a 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_1_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_1_28000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_1_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_1_28000_96Filler.json
index 2303c5bb9..2303c5bb9 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_1_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_1_28000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_2_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_2_21000_128Filler.json
index 2eaf15610..2eaf15610 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_2_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_2_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_2_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_2_21000_96Filler.json
index 494818b4c..494818b4c 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_2_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_2_21000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_2_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_2_28000_128Filler.json
index 3d57479f7..3d57479f7 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_2_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_2_28000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_2_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_2_28000_96Filler.json
index ad5da7e84..ad5da7e84 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_2_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_2_28000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_128Filler.json
index da55bf745..da55bf745 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_80Filler.json
index 5f145ff11..5f145ff11 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_80Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_96Filler.json
index 19178a220..19178a220 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_21000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_128Filler.json
index 50ec22d2f..50ec22d2f 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_80Filler.json
index 22879cbb1..22879cbb1 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_80Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_96Filler.json
index 85b4ce325..85b4ce325 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_340282366920938463463374607431768211456_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_340282366920938463463374607431768211456_28000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5616_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_5616_21000_128Filler.json
index 6b4aed90a..6b4aed90a 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5616_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_5616_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5616_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_5616_21000_96Filler.json
index bf4e1f55f..bf4e1f55f 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5616_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_5616_21000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5616_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_5616_28000_128Filler.json
index 83eca7772..83eca7772 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5616_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_5616_28000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5616_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_5616_28000_96Filler.json
index d82ed27c5..d82ed27c5 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5616_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_5616_28000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5617_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_5617_21000_128Filler.json
index 16cbc45f9..16cbc45f9 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5617_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_5617_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5617_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_5617_21000_96Filler.json
index 684416ce2..684416ce2 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5617_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_5617_21000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5617_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_5617_28000_128Filler.json
index aad68ed29..aad68ed29 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5617_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_5617_28000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5617_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_5617_28000_96Filler.json
index c06bad19a..c06bad19a 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_5617_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_5617_28000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9935_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_9935_21000_128Filler.json
index 51212cbb9..51212cbb9 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9935_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_9935_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9935_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_9935_21000_96Filler.json
index d938c294d..d938c294d 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9935_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_9935_21000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9935_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_9935_28000_128Filler.json
index 1d3fcc6be..1d3fcc6be 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9935_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_9935_28000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9935_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_9935_28000_96Filler.json
index 8364b1205..8364b1205 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9935_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_9935_28000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_9_21000_128Filler.json
index 196036330..196036330 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_9_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_9_21000_96Filler.json
index 65cac9387..65cac9387 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_9_21000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_9_28000_128Filler.json
index 21552dada..21552dada 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_9_28000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_9_28000_96Filler.json
index b334c860c..b334c860c 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-0_9_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-0_9_28000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_0_21000_128Filler.json
index 5d553106c..5d553106c 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_0_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_21000_64Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_0_21000_64Filler.json
index cc1589fff..cc1589fff 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_21000_64Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_0_21000_64Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_21000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_0_21000_80Filler.json
index 2bca595f5..2bca595f5 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_21000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_0_21000_80Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_0_21000_96Filler.json
index 2c4883ea9..2c4883ea9 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_0_21000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_0_28000_128Filler.json
index 925a2503b..925a2503b 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_0_28000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_28000_64Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_0_28000_64Filler.json
index c839cae0c..c839cae0c 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_28000_64Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_0_28000_64Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_28000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_0_28000_80Filler.json
index f3213f201..f3213f201 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_28000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_0_28000_80Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_0_28000_96Filler.json
index 2212cf61a..2212cf61a 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_0_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_0_28000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_1_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_1_21000_128Filler.json
index 1f2e5eff5..1f2e5eff5 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_1_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_1_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_1_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_1_21000_96Filler.json
index 34b4a607b..34b4a607b 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_1_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_1_21000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_1_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_1_28000_128Filler.json
index b2c27f6de..b2c27f6de 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_1_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_1_28000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_1_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_1_28000_96Filler.json
index 48798a138..48798a138 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_1_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_1_28000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_2_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_2_21000_128Filler.json
index 02620320e..02620320e 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_2_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_2_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_2_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_2_21000_96Filler.json
index f652f4a1a..f652f4a1a 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_2_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_2_21000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_2_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_2_28000_128Filler.json
index b908c55d2..b908c55d2 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_2_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_2_28000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_2_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_2_28000_96Filler.json
index 2571260c6..2571260c6 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_2_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_2_28000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_128Filler.json
index 32309fd64..32309fd64 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_80Filler.json
index 4550b3bac..4550b3bac 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_80Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_96Filler.json
index b4dc6b595..b4dc6b595 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_21000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_128Filler.json
index f9e615a5f..f9e615a5f 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_80Filler.json
index 76dbd5919..76dbd5919 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_80Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_96Filler.json
index 48d641fd1..48d641fd1 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_340282366920938463463374607431768211456_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_340282366920938463463374607431768211456_28000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5616_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5616_21000_128Filler.json
index 31efca781..31efca781 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5616_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5616_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5616_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5616_21000_96Filler.json
index 035820643..035820643 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5616_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5616_21000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5616_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5616_28000_128Filler.json
index 6d382d596..6d382d596 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5616_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5616_28000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5616_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5616_28000_96Filler.json
index 7a2a5240d..7a2a5240d 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5616_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5616_28000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5617_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5617_21000_128Filler.json
index f2ab6aa8e..f2ab6aa8e 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5617_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5617_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5617_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5617_21000_96Filler.json
index f5eec0866..f5eec0866 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5617_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5617_21000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5617_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5617_28000_128Filler.json
index c557b31fd..c557b31fd 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5617_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5617_28000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5617_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5617_28000_96Filler.json
index e0f7497e8..e0f7497e8 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_5617_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_5617_28000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9935_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_9935_21000_128Filler.json
index 23f7a3a72..23f7a3a72 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9935_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_9935_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9935_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_9935_21000_96Filler.json
index 21d6e8186..21d6e8186 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9935_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_9935_21000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9935_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_9935_28000_128Filler.json
index 5424c8d8d..5424c8d8d 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9935_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_9935_28000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9935_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_9935_28000_96Filler.json
index 5d83d212c..5d83d212c 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9935_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_9935_28000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_9_21000_128Filler.json
index db3310a81..db3310a81 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_9_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_9_21000_96Filler.json
index 61215a9d3..61215a9d3 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_9_21000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_9_28000_128Filler.json
index 31e19d2f9..31e19d2f9 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_9_28000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_9_28000_96Filler.json
index 4670e053e..4670e053e 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_0-3_9_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_0-3_9_28000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_0_21000_128Filler.json
index 3d6cead69..3d6cead69 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_0_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_21000_64Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_0_21000_64Filler.json
index ad6793e6f..ad6793e6f 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_21000_64Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_0_21000_64Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_21000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_0_21000_80Filler.json
index 191521dae..191521dae 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_21000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_0_21000_80Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_0_21000_96Filler.json
index 3654276fb..3654276fb 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_0_21000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_0_28000_128Filler.json
index 61ee13cac..61ee13cac 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_0_28000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_28000_64Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_0_28000_64Filler.json
index a4eef97d0..a4eef97d0 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_28000_64Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_0_28000_64Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_28000_80Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_0_28000_80Filler.json
index 86d1a3404..86d1a3404 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_28000_80Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_0_28000_80Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_0_28000_96Filler.json
index 35561cef6..35561cef6 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_0_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_0_28000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_1_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_1_21000_128Filler.json
index 2c16ac11f..2c16ac11f 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_1_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_1_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_1_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_1_21000_96Filler.json
index 3de32bebc..3de32bebc 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_1_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_1_21000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_1_28000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_1_28000_128Filler.json
index 6cabd70a6..6cabd70a6 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_1_28000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_1_28000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_1_28000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_1_28000_96Filler.json
index 262bfa4cd..262bfa4cd 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_1_28000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_1_28000_96Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_2_21000_128Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_2_21000_128Filler.json
index 6606dc3ea..6606dc3ea 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_2_21000_128Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_2_21000_128Filler.json
diff --git a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_2_21000_96Filler.json b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_2_21000_96Filler.json
index 73d87271c..73d87271c 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/ecmul_1-2_2_21000_96Filler.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge2/ecmul_1-2_2_21000_96Filler.json