fix invalid json fillers

21 files changed, 554 insertions, 554 deletions

diff --git a/src/GeneralStateTestsFiller/stCallCodes/callcodeDynamicCodeFiller.json b/src/GeneralStateTestsFiller/stCallCodes/callcodeDynamicCodeFiller.json
index 375e91f36..2e93ac60d 100644
--- a/src/GeneralStateTestsFiller/stCallCodes/callcodeDynamicCodeFiller.json
+++ b/src/GeneralStateTestsFiller/stCallCodes/callcodeDynamicCodeFiller.json
@@ -57,11 +57,11 @@
         "pre" : {
             "1000000000000000000000000000000000000000" : {
                 "balance" : "10000",
-		"code" : "{ (MSTORE 0 0x600160005533601455) (RETURN 23 9) }",
-                "code" : "{ (MSTORE 0 0x6860016000553360145560005260096017f3) [[ 10 ]] (CREATE 1 14 18) [[ 11 ]] (CALLCODE 100000 0xffe4ebd2a68c02d9dcb0a17283d13346beb2d8b6 0 0 64 0 64 ) }",	
-		"code" : "0x716860016000553360145560005260096017f36000526012600e6001f0600a55604060006040600060007313136008b64ff592819b2fa6d43f2835c452020e620186a0f2600b55",
-		"code" : "            0x0102030405060708091011121314151617181920212223242526272829303132             0x0102030405060708091011121314151617181920212223242526272829303132",
-		"code" : "{ (MSTORE 0 0x716860016000553360145560005260096017f36000526012600e6001f0600a55) (MSTORE 32 0x6040600060406000600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b662) 				    (MSTORE 64 0x0186a0f2600b5500000000000000000000000000000000000000000000000000) (CREATE 1 0 96) }",
+		"//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) }",
                 "nonce" : "0",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/QuadraticComplexitySolidity_CallDataCopyFiller.json b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/QuadraticComplexitySolidity_CallDataCopyFiller.json
index a5251b99f..b64e6be52 100644
--- a/src/GeneralStateTestsFiller/stQuadraticComplexityTest/QuadraticComplexitySolidity_CallDataCopyFiller.json
+++ b/src/GeneralStateTestsFiller/stQuadraticComplexityTest/QuadraticComplexitySolidity_CallDataCopyFiller.json
@@ -41,20 +41,20 @@
         ],
         "pre" : {
             "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "//" : "contract caller								",
-                "//" : "{									",
-                "//" : "    int value;								",
-                "//" : "    function run(int count)						",
-                "//" : "    {									",
-                "//" : "        value = count;							",
-                "//" : "        address a = 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b;		",
-                "//" : "        while(count > 0)						",
-                "//" : "        {								",
-                "//" : "            a.call('just', 'call');					",
-                "//" : "            count = count - 1;						",
-                "//" : "        }								",
-                "//" : "    }									",
-                "//" : "}									",
+                "//comment1" : "contract caller",
+                "//comment2" : "{",
+                "//comment3" : "    int value;",
+                "//comment4" : "    function run(int count)",
+                "//comment5" : "    {",
+                "//comment6" : "        value = count;",
+                "//comment7" : "        address a = 0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b;",
+                "//comment8" : "        while(count > 0)",
+                "//comment9" : "        {",
+                "//comment10" : "            a.call('just', 'call');",
+                "//comment11" : "            count = count - 1;",
+                "//comment12" : "        }",
+                "//comment13" : "    }",
+                "//comment14" : "}",
                 "balance" : "500000000",
                 "code" : "0x60003560e060020a9004806361a4770614601557005b601e6004356024565b60006000f35b60008160008190555073b94f5374fce5edbc8e2a8697c15331677e6ebf0b90505b600082131560bf5780600160a060020a03166000600060007f6a7573740000000000000000000000000000000000000000000000000000000081526004017f63616c6c000000000000000000000000000000000000000000000000000000008152602001600060008560155a03f150506001820391506045565b505056",
                 "nonce" : "0",
diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_multimpleSuicideFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_multimpleSuicideFiller.json
index 3554ca508..46f04e9da 100644
--- a/src/GeneralStateTestsFiller/stRefundTest/refund_multimpleSuicideFiller.json
+++ b/src/GeneralStateTestsFiller/stRefundTest/refund_multimpleSuicideFiller.json
@@ -74,23 +74,23 @@
             "1000000000000000000000000000000000000001" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "contract Killer {",
-                "code" : "  function homicide() {",
-                "code" : "      suicide(msg.sender);",
-                "code" : "    }",
-                "code" : "",
-                "code" : "    function multipleHomocide() {",
-                "code" : "        Killer k  = this;",
-                "code" : "        k.homicide();",
-                "code" : "        k.homicide();",
-                "code" : "    }",
-                "code" : "",
-                "code" : "    function run() returns (bool)",
-                "code" : "    {",
-                "code" : "	  multipleHomocide();",
-                "code" : "	  return true;",
-                "code" : "    }",
-                "code" : "}",
+                "//comment1" : "contract Killer {",
+                "//comment2" : "  function homicide() {",
+                "//comment3" : "      suicide(msg.sender);",
+                "//comment4" : "    }",
+                "//comment5" : "",
+                "//comment6" : "    function multipleHomocide() {",
+                "//comment7" : "        Killer k  = this;",
+                "//comment8" : "        k.homicide();",
+                "//comment9" : "        k.homicide();",
+                "//comment10" : "    }",
+                "//comment11" : "",
+                "//comment12" : "    function run() returns (bool)",
+                "//comment13" : "    {",
+                "//comment14" : "  multipleHomocide();",
+                "//comment15" : "  return true;",
+                "//comment16" : "    }",
+                "//comment17" : "}",
                 "code" : "0x606060405260e060020a600035046309e587a58114610031578063c04062261461004d578063dd4f1f2a1461005a575b005b61002f3373ffffffffffffffffffffffffffffffffffffffff16ff5b6100f5600061010961005e565b61002f5b60003090508073ffffffffffffffffffffffffffffffffffffffff166309e587a56040518160e060020a0281526004018090506000604051808303816000876161da5a03f1156100025750604080517f09e587a500000000000000000000000000000000000000000000000000000000815290516004828101926000929190829003018183876161da5a03f1156100025750505050565b604080519115158252519081900360200190f35b5060019056",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stRefundTest/refund_singleSuicideFiller.json b/src/GeneralStateTestsFiller/stRefundTest/refund_singleSuicideFiller.json
index ab80f1db0..7f2d59d6b 100644
--- a/src/GeneralStateTestsFiller/stRefundTest/refund_singleSuicideFiller.json
+++ b/src/GeneralStateTestsFiller/stRefundTest/refund_singleSuicideFiller.json
@@ -74,22 +74,22 @@
             "1000000000000000000000000000000000000001" : {
                 "balance" : "1000000000000000000",
                 "nonce" : "0",
-                "code" : "contract Killer {",
-                "code" : "  function homicide() {",
-                "code" : "      suicide(msg.sender);",
-                "code" : "    }",
-                "code" : "",
-                "code" : "    function multipleHomocide() {",
-                "code" : "        Killer k  = this;",
-                "code" : "        k.homicide();",
-                "code" : "    }",
-                "code" : "",
-                "code" : "    function run() returns (bool)",
-                "code" : "    {",
-                "code" : "	  multipleHomocide();",
-                "code" : "	  return true;",
-                "code" : "    }",
-                "code" : "}",
+                "//comment1" : "contract Killer {",
+                "//comment2" : "  function homicide() {",
+                "//comment3" : "      suicide(msg.sender);",
+                "//comment4" : "    }",
+                "//comment5" : "",
+                "//comment6" : "    function multipleHomocide() {",
+                "//comment7" : "        Killer k  = this;",
+                "//comment8" : "        k.homicide();",
+                "//comment9" : "    }",
+                "//comment10" : "",
+                "//comment11" : "    function run() returns (bool)",
+                "//comment12" : "    {",
+                "//comment13" : "  multipleHomocide();",
+                "//comment14" : "  return true;",
+                "//comment15" : "    }",
+                "//comment16" : "}",
                 "code" : "0x606060405260e060020a600035046309e587a58114602e5780632e4699ed146049578063c040622614609b575b005b602c3373ffffffffffffffffffffffffffffffffffffffff16ff5b602c5b60003090508073ffffffffffffffffffffffffffffffffffffffff166309e587a56040518160e060020a0281526004018090506000604051808303816000876161da5a03f11560025750505050565b60a5600060b9604c565b604080519115158252519081900360200190f35b5060019056",
                 "storage" : {
                 }
diff --git a/src/GeneralStateTestsFiller/stSolidityTest/AmbiguousMethodFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/AmbiguousMethodFiller.json
index eea91c7ef..489d6eb74 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/AmbiguousMethodFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/AmbiguousMethodFiller.json
@@ -28,23 +28,23 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//" : "contract contract1		",
-		"//" : "{				",
-		"//" : "    uint value;			",
-		"//" : "    function run()		",
-		"//" : "    {				",
-		"//" : "        value = 225;		",
-		"//" : "    }				",
-		"//" : "}				",
-		"//" : "				",
-		"//" : "contract contract2		",
-		"//" : "{				",
-		"//" : "    uint value2;		",
-		"//" : "    function run()		",
-		"//" : "    {				",
-		"//" : "        value2 = 335;		",
-		"//" : "    }				",
-		"//" : "}				",
+		"//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 6d29f4be8..a200b099c 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/CallInfiniteLoopFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/CallInfiniteLoopFiller.json
@@ -26,23 +26,23 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//" : "contract recursiveMethods		",
-		"//" : "{					",
-		"//" : "    function testInfiniteLoop()		",
-		"//" : "    {					",
-		"//" : "        while(true){}			",
-		"//" : "    }					",
-		"//" : "    					",
-		"//" : "    function testRecursiveMethods()	",
-		"//" : "    {					",
-		"//" : "        testRecursiveMethods2();	",
-		"//" : "    }					",
-		"//" : "    					",
-		"//" : "    function testRecursiveMethods2()	",
-		"//" : "    {					",
-		"//" : "        testRecursiveMethods();		",
-		"//" : "    }					",
-		"//" : "}",
+		"//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 1885e93ef..969d0b243 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/CallLowLevelCreatesSolidityFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/CallLowLevelCreatesSolidityFiller.json
@@ -30,32 +30,32 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//": "contract subcaller			",
-		"//": "{					",
-		"//": "  function init(address a)		",
-		"//": "  {					",
-		"//": "    main(a).setdata(225);		",
-		"//": "  }					",
-		"//": "}					",
-		"//": "						",
-		"//": "contract main				",
-		"//": "{					",
-		"//": "   uint data;				",
-		"//": "   address msgsender;			",
-		"//": "   function run() returns (uint)		",
-		"//": "   {					",
-		"//": "       data = 1;				",
-		"//": "	      msgsender = 0x095e7baea6a6c7c4c2dfeb977efac326af552d87;		",
-		"//": "       subcaller a = new subcaller();	",
-		"//": "       a.init(msgsender);		",
-		"//": "       return data;			",
-		"//": "   }					",
-		"//": "   					",
-		"//": "   function setdata(uint _data)		",
-		"//": "   {					",
-		"//": "       data = _data;			",
-		"//": "   }					",
-		"//": "}",
+		"//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 91d2c56d8..fd6b2ca62 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/CallRecursiveMethodsFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/CallRecursiveMethodsFiller.json
@@ -26,23 +26,23 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//" : "contract recursiveMethods		",
-		"//" : "{					",
-		"//" : "    function testInfiniteLoop()		",
-		"//" : "    {					",
-		"//" : "        while(true){}			",
-		"//" : "    }					",
-		"//" : "    					",
-		"//" : "    function testRecursiveMethods()	",
-		"//" : "    {					",
-		"//" : "        testRecursiveMethods2();	",
-		"//" : "    }					",
-		"//" : "    					",
-		"//" : "    function testRecursiveMethods2()	",
-		"//" : "    {					",
-		"//" : "        testRecursiveMethods();		",
-		"//" : "    }					",
-		"//" : "}",
+		"//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 e8e456273..4dae11ce5 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/ContractInheritanceFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/ContractInheritanceFiller.json
@@ -28,43 +28,43 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//" : "contract base						",
-		"//" : "{							",
-		"//" : "    function methodA() returns (uint32)			",
-		"//" : "    {							",
-		"//" : "        return 1;					",
-		"//" : "    }							",
-		"//" : "}							",
-		"//" : "							",
-		"//" : "contract frombase is base				",
-		"//" : "{							",
-		"//" : "    function methodA() returns (uint32)			",
-		"//" : "    {							",
-		"//" : "        return 2;					",
-		"//" : "    }							",
-		"//" : "}							",
-		"//" : "							",
-		"//" : "contract main						",
-		"//" : "{							",						
-		"//" : "    bool returnValue;					",
-		"//" : "    function run() returns (bool)			",
-		"//" : "    {							",							
-		"//" : "       returnValue = testInheretance();			",
-		"//" : "       return returnValue; 				",
-		"//" : "    }							",							
-		"//" : "   							",
-		"//" : "    function testInheretance() returns (bool res)	",							
-		"//" : "    {							",	
-		"//" : "        res = true;					",
-		"//" : "        base contract1 = new base();			",
-		"//" : "        if (contract1.methodA() != 1)			",
-		"//" : "            return false;				",
-		"//" : "							",        
-		"//" : "        frombase contract2 = new frombase();		",
-		"//" : "        if (contract2.methodA() != 2)			",
-		"//" : "            return false;				",
-		"//" : "    }							",
-		"//" : "}",
+		"//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 d184fbd58..b9825847c 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/CreateContractFromMethodFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/CreateContractFromMethodFiller.json
@@ -73,31 +73,31 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//": "contract TestContract							",
-		"//": "{									",
-		"//": "    function testMethod() returns (int res) 				",
-		"//": "    {									",
-		"//": "        return 225; 							",
-    		"//": "    } 									",
-		"//": "     									",
-		"//": "    function destroy(address sendFoundsTo) 				",
-		"//": "    { 									",
-		"//": "        suicide(sendFoundsTo);         					",
-		"//": "    } 									",
-		"//": "}									",
-		"//": "										",
-		"//": "contract main								",
-		"//": "{									",
-		"//": "   function run() returns (uint)						",
-		"//": "   {									",
-		"//": "       createContractFromMethod();					",
-		"//": "   }									",
-		"//": "   									",
-		"//": "   function createContractFromMethod() returns (TestContract a)		",
-		"//": "   { 									",
-		"//": "       a = new TestContract(); 						",
-		"//": "   } 									",
-		"//": "}									",
+		"//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 9d28717b3..47cc179fb 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsCreate4ContractsFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsCreate4ContractsFiller.json
@@ -94,47 +94,47 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000000000000000000",
-		"//" : "contract recursiveCreate1							",
-		"//" : "{										",
-		"//" : "    uint depp;									",
-		"//" : "    function recursiveCreate1(address a, uint depth)				",
-		"//" : "    {										",
-		"//" : "        depth = depth - 1;							",
-		"//" : "	depp = depth;								",
-		"//" : "        if(depth > 0)								",
-		"//" : "            main(a).create2(depth);						",
-		"//" : "    }										",
-		"//" : "}										",
-		"//" : "										",
-		"//" : "contract recursiveCreate2							",
-		"//" : "{										",
-		"//" : "    uint depp;									",
-		"//" : "    function recursiveCreate2(address a, uint depth)				",
-		"//" : "    {										",
-		"//" : "        depth = depth - 1;							",
-		"//" : "	depp = depth;								",
-		"//" : "        if(depth > 0)								",
-		"//" : "            recursiveCreate1 rec1 = new recursiveCreate1(a, depth);		",
-    		"//" : "    }										",
-		"//" : "}										",
-		"//" : "										",
-		"//" : "contract main									",
-		"//" : "{										",
-		"//" : "    address maincontract;							",
-		"//" : "    uint depp;									",
-		"//" : "    function run(uint depth)							",
-		"//" : "    {										",
-		"//" : "        maincontract = 0x095e7baea6a6c7c4c2dfeb977efac326af552d87;		",
-		"//" : "        depp = depth;								",
-		"//" : "        recursiveCreate1 rec1 = new recursiveCreate1(maincontract, depth);	",
-		"//" : "    }										",
-		"//" : "    										",
-		"//" : "    function create2(uint depth)						",
-		"//" : "    {										",
-		"//" : "        recursiveCreate2 rec2 = new recursiveCreate2(maincontract, depth);	",
-		"//" : "        address(rec2).send(2);							",
-		"//" : "    }										",
-		"//" : "}",
+		"//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 6d49080f0..d253ff969 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/RecursiveCreateContractsFiller.json
@@ -86,47 +86,47 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "1000000000000000000000000000000000",
-		"//" : "contract recursiveCreate1							",
-		"//" : "{										",
-		"//" : "    uint depp;									",
-		"//" : "    function recursiveCreate1(address a, uint depth)				",
-		"//" : "    {										",
-		"//" : "        depth = depth - 1;							",
-		"//" : "	depp = depth;								",
-		"//" : "        if(depth > 0)								",
-		"//" : "            main(a).create2(depth);						",
-		"//" : "    }										",
-		"//" : "}										",
-		"//" : "										",
-		"//" : "contract recursiveCreate2							",
-		"//" : "{										",
-		"//" : "    uint depp;									",
-		"//" : "    function recursiveCreate2(address a, uint depth)				",
-		"//" : "    {										",
-		"//" : "        depth = depth - 1;							",
-		"//" : "	depp = depth;								",
-		"//" : "        if(depth > 0)								",
-		"//" : "            recursiveCreate1 rec1 = new recursiveCreate1(a, depth);		",
-    		"//" : "    }										",
-		"//" : "}										",
-		"//" : "										",
-		"//" : "contract main									",
-		"//" : "{										",
-		"//" : "    address maincontract;							",
-		"//" : "    uint depp;									",
-		"//" : "    function run(uint depth)							",
-		"//" : "    {										",
-		"//" : "        maincontract = 0x095e7baea6a6c7c4c2dfeb977efac326af552d87;		",
-		"//" : "        depp = depth;								",
-		"//" : "        recursiveCreate1 rec1 = new recursiveCreate1(maincontract, depth);	",
-		"//" : "    }										",
-		"//" : "    										",
-		"//" : "    function create2(uint depth)						",
-		"//" : "    {										",
-		"//" : "        recursiveCreate2 rec2 = new recursiveCreate2(maincontract, depth);	",
-		"//" : "        address(rec2).send(2);							",
-		"//" : "    }										",
-		"//" : "}",
+		"//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 02bc211c5..66fe584ca 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/TestBlockAndTransactionPropertiesFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/TestBlockAndTransactionPropertiesFiller.json
@@ -28,49 +28,49 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//" : "contract main										",
-		"//" : "{											",
-		"//" : "    bool returnValue;									",
-		"//" : "    function run() returns (bool)							",
-		"//" : "    {											",
-		"//" : "       returnValue = testBlockAndTransactionProperties();				",
-		"//" : "       return returnValue;								",
-		"//" : "    }											",
-		"//" : "   											",
-		"//" : "    function testBlockAndTransactionProperties() returns (bool res)			",
-		"//" : "    { 											",
-		"//" : "        res = true; 									",
-		"//" : "        if (block.coinbase != 0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba)		",
-		"//" : "            return false; 								",
-		"//" : "         										",
-		"//" : "        if (block.difficulty != 45678256) 						",
-		"//" : "            return false; 								",
-		"//" : "         										",
-		"//" : "        if (block.gaslimit != 0x7fffffffffffffff)	 				",
-		"//" : "            return false; 								",
-		"//" : "             										",
-		"//" : "        if (block.number != 120) 							",
-		"//" : "            return false; 								",
-		"//" : "         										",
-		"//" : "        //try to call this 								",
-		"//" : "        block.blockhash(120); 								",
-		"//" : "        block.timestamp; 								",
-		"//" : "        msg.gas; 									",
-		"//" : "         										",
-		"//" : "        if (msg.sender != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)			",
-		"//" : "            return false; 								",
-		"//" : "         										",
-		"//" : "        if (msg.value != 100) 								",
-		"//" : "            return false; 								",
-		"//" : "             										",
-		"//" : "        if (tx.gasprice != 1) 								",
-		"//" : "            return false; 								",
-		"//" : "         										",
-		"//" : "        if (tx.origin != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b) 			",
-		"//" : "            return false; 								",
-		"//" : "     											",
-		"//" : "    } 											",
-		"//" : "}											",
+		"//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 78872bb56..b66bbeeb2 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/TestContractInteractionFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/TestContractInteractionFiller.json
@@ -29,35 +29,35 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//": "contract TestContract							",
-		"//": "{									",
-		"//": "    function testMethod() returns (int res) 				",
-		"//": "    {									",
-		"//": "        return 225; 							",
-    		"//": "    } 									",
-		"//": "     									",
-		"//": "    function destroy(address sendFoundsTo) 				",
-		"//": "    { 									",
-		"//": "        suicide(sendFoundsTo);         					",
-		"//": "    } 									",
-		"//": "}									",
-		"//": "contract main								",
-		"//": "{									",
-		"//": "    bool returnValue;							",
-		"//": "    function run() returns (bool)					",
-		"//": "    {									",
-		"//": "       returnValue = testContractInteraction();				",
-		"//": "       return returnValue;						",
-		"//": "    }									",
-		"//": "   									",
-		"//" : "    function testContractInteraction() returns (bool res) 		",
-		"//" : "    { 									",
-		"//" : "        TestContract a = new TestContract(); 				",
-		"//" : "        if (a.testMethod() == 225) 					",
-		"//" : "            return true; 						",
-		"//" : "        return false; 							",
-		"//" : "    } 									",
-		"//": "}									",
+		"//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 76cc1d3ed..c4cf495a8 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/TestContractSuicideFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/TestContractSuicideFiller.json
@@ -29,36 +29,36 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//": "contract TestContract							",
-		"//": "{									",
-		"//": "    function testMethod() returns (int res) 				",
-		"//": "    {									",
-		"//": "        return 225; 							",
-    		"//": "    } 									",
-		"//": "     									",
-		"//": "    function destroy(address sendFoundsTo) 				",
-		"//": "    { 									",
-		"//": "        suicide(sendFoundsTo);         					",
-		"//": "    } 									",
-		"//": "}									",
-		"//": "contract main								",
-		"//": "{									",
-		"//": "	   bool returnValue;							",
-		"//": "    function run() returns (bool)					",
-		"//": "    {									",
-		"//": "       returnValue = testContractSuicide();				",
-		"//": "	      return returnValue;						",
-		"//": "    }									",
-		"//": "   									",
-		"//": "    function testContractSuicide() returns (bool res) 			",
-		"//": "    { 									",
-		"//": "        TestContract a = new TestContract(); 				",
-		"//": "        a.destroy(block.coinbase); 					",
-		"//": "        if (a.testMethod() == 225) //we should be able to call a contract  ",
-		"//": "            return true; 						",
-		"//": "        return false; 							",
-		"//": "    } 									",
-		"//": "}									",
+		"//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 ad256e846..1e557f2a8 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/TestCryptographicFunctionsFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/TestCryptographicFunctionsFiller.json
@@ -28,34 +28,34 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//" : "contract main													",
-		"//" : "{														",
-		"//" : "    bool returnValue;												",
-		"//" : "    function run() returns (bool)										",
-		"//" : "    {														",
-		"//" : "       returnValue = testCryptographicFunctions();								",
-		"//" : "       return returnValue; 											",
-		"//" : "    }														",
-		"//" : "   														",
-		"//" : "    function testCryptographicFunctions() returns (bool res)							",
-		"//" : "    {														",
-		"//" : "        res = true;												",
-		"//" : "        if (sha3('teststring') != 0x43c4b4524adb81e4e9a5c4648a98e9d320e3908ac5b6c889144b642cd08ae16d)		",
-		"//" : "            return false;											",
-		"//" : "        													",
-		"//" : "        if (sha256('teststring') != 0x3c8727e019a42b444667a587b6001251becadabbb36bfed8087a92c18882d111)		",
-		"//" : "            return false;											",
-		"//" : "            													",
-		"//" : "        if (ripemd160('teststring') != 0xcd566972b5e50104011a92b59fa8e0b1234851ae)				",
-		"//" : "            return false;											",
-		"//" : "        													",
-		"//" : "	if (ecrecover(0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c,			",
-		"//" : "                      28, 0x73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f, 			",
-		"//" : "                      0xeeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549) 			",
-		"//" : "                      != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)						",
-		"//" : "        	return false;											",
-		"//" : "    }														",
-		"//" : "}														",
+		"//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 7486b4e69..4af87bcc6 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/TestKeywordsFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/TestKeywordsFiller.json
@@ -28,49 +28,49 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//": "contract main								",
-		"//": "{									",
-		"//": "    bool returnValue;							",
-		"//": "    function run() returns (bool)					",
-		"//": "    {									",
-		"//": "	      returnValue = testKeywords();					",
-		"//": "       return returnValue;						",
-		"//": "    }									",
-		"//": "   									",
-		"//": "    function testKeywords() returns (bool res) 				",
-		"//": "    { 									",
-		"//": "        //some simple checks for the if statemnt 			",
-		"//": "        //if, else, while, for, break, continue, return 			",
-		"//": "        int i = 0; 							",
-		"//": "        res = false; 							",
-		"//": "          								",
-		"//": "        if (i == 0) 							",
-		"//": "        { 								",
-		"//": "            if( i <= -25) 						",
-		"//": "            { 								",
-		"//": "                return false; 						",
-		"//": "            } 								",
-		"//": "            else  							",
-		"//": "            { 								",
-		"//": "                while(i < 10) 						",
-		"//": "                    i++; 						",
-		"//": "                     							",
-		"//": "                if (i == 10) 						",
-		"//": "                { 							",
-		"//": "                    for(var j=10; j>0; j--) 				",
-		"//": "                    { 							",
-		"//": "                        i--; 						",
-		"//": "                    } 							",
-		"//": "                } 							",
-		"//": "            } 								",
-		"//": "        } 								",
-		"//": "          								",
-		"//": "        if (i == 0) 							",
-		"//": "            return true; 						",
-		"//": "         								",
-		"//": "        return false; 							",
-		"//": "    } 									",
-		"//": "}									",
+		"//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 7a5049b89..b7362d019 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/TestOverflowFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/TestOverflowFiller.json
@@ -28,31 +28,31 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//" : "contract main												",
-		"//" : "{													",	
-		"//" : "    bool returnValue;											",	
-		"//" : "    function run() returns (bool)									",	
-		"//" : "    {													",	
-		"//" : "       returnValue = testOverflow();									",
-		"//" : "       return returnValue; 										",	
-		"//" : "    }													",	
-		"//" : "   													",	
-		"//" : "    function testOverflow() returns (bool res)								",
-		"//" : "    {													",
-		"//" : "        res = true;											",
-		"//" : "        uint256 a = 115792089237316195423570985008687907853269984665640564039457584007913129639935;	",
-		"//" : "        if (a + 1 != 0)											",
-		"//" : "            return false;										",
-		"//" : "        												",
-		"//" : "        uint32 b = 4294967295;										",
-		"//" : "        if (b + 1 != 0)											",
-		"//" : "            return false;										",
-		"//" : "        												",
-		"//" : "        uint64 c = 18446744073709551615;								",
-		"//" : "        if (c + 1 != 0)											",
-		"//" : "            return false;										",
-		"//" : "    }													",	
-		"//" : "}													",
+		"//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 cf3072376..3ec40b75c 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/TestStoreGasPricesFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/TestStoreGasPricesFiller.json
@@ -33,41 +33,41 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//" : "contract main                                                   ",
-		"//" : "{								",
-		"//" : "  uint[32] m_gasUsed;						",
-		"//" : "  int storage;							",
-		"//" : "  function run() returns (bool)					",
-		"//" : "  {								",
-     		"//" : "     uint startgas = msg.gas; 					",
-		"//" : "								",
-		"//" : "     storage = 1;  //zero to non zero				",
-		"//" : "     m_gasUsed[0] = startgas - msg.gas; 			",
-		"//" : "     startgas = msg.gas; 					",
-		"//" : "								",
-		"//" : "     storage = 2;  //non zero to non zero			",
-		"//" : "     m_gasUsed[1] = startgas - msg.gas; 			",
-		"//" : "     startgas = msg.gas; 					",
-		"//" : "								",
-		"//" : "     storage = 2;  //non zero to same non zero			",
-		"//" : "     m_gasUsed[2] = startgas - msg.gas; 			",
-		"//" : "     startgas = msg.gas; 					",
-		"//" : "								",
-		"//" : "     storage = 24784793845734;  //non zero to huge non zero	",
-		"//" : "     m_gasUsed[3] = startgas - msg.gas; 			",
-		"//" : "     startgas = msg.gas; 					",
-		"//" : "								",
-		"//" : "     storage = 2;  //huge non zero to non zero			",
-		"//" : "     m_gasUsed[4] = startgas - msg.gas; 			",
-		"//" : "     startgas = msg.gas; 					",
-		"//" : "								",
-		"//" : "     storage = 0;  //non zero to zero				",
-		"//" : "     m_gasUsed[5] = startgas - msg.gas; 			",
-		"//" : "     startgas = msg.gas; 					",
-		"//" : "								",
-		"//" : "     return true;						",
-		"//" : "  }								",
-		"//" : "}								",
+		"//comment1" : "contract main",
+		"//comment2" : "{",
+		"//comment3" : "  uint[32] m_gasUsed;",
+		"//comment4" : "  int storage;",
+		"//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" : "}",
                 "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463c04062268114602d57005b6033603d565b8060005260206000f35b600060005a600160205590505a81036000555a600260205590505a81036001555a600260205590505a81036002555a65168aa8d53fe660205590505a81036003555a600260205590505a81036004555a600060205590505a81036005555a5060019291505056",
                 "nonce" : "0",
                 "storage" : {
diff --git a/src/GeneralStateTestsFiller/stSolidityTest/TestStructuresAndVariablessFiller.json b/src/GeneralStateTestsFiller/stSolidityTest/TestStructuresAndVariablessFiller.json
index c632ecb50..53ef8cc9e 100644
--- a/src/GeneralStateTestsFiller/stSolidityTest/TestStructuresAndVariablessFiller.json
+++ b/src/GeneralStateTestsFiller/stSolidityTest/TestStructuresAndVariablessFiller.json
@@ -33,49 +33,49 @@
         "pre" : {
             "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "100000",
-		"//" : "contract main										",
-		"//" : "{											",
-    		"//" : "    struct StructTest  									",
-		"//" : "    { 											",
-		"//" : "        address addr; 									",
-		"//" : "        int amount; 									",
-		"//" : "        bytes32 str; 									",
-		"//" : "        mapping (uint => address) funders; 						",
-		"//" : "    } 											",
-		"//" : "     											",
-		"//" : "    bool returnValue;									",
-		"//" : "    int globalValue; 									",
-		"//" : "    StructTest globalData; 								",
-		"//" : "    function run() returns (bool)							",
-		"//" : "    {											",
-		"//" : "        globalValue = 255; 								",
-		"//" : "        globalData.addr = 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b; 			",
-		"//" : "        globalData.amount = 255; 							",
-		"//" : "        globalData.str = 'global data 32 length string'; 				",
-		"//" : "        globalData.funders[0] = 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b; 		",
-		"//" : "        returnValue = testStructuresAndVariabless();					",
-		"//" : "     	return 	returnValue;								",
-		"//" : "    }											",
-		"//" : "   											",
-		"//" : "    function testStructuresAndVariabless() returns (bool res) 				",
-		"//" : "    { 											",
-		"//" : "        res = true; 									",
-		"//" : "        if (globalValue != 255) 							",
-		"//" : "            return false; 								",
-		"//" : "         										",
-		"//" : "        if (globalValue != globalData.amount) 						",
-		"//" : "            return false; 								",
-		"//" : "         										",
-		"//" : "        if (globalData.addr != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)		",
-		"//" : "            return false; 								",
-		"//" : "         										",
-		"//" : "        if (globalData.str != 'global data 32 length string')     			",
-		"//" : "            return false; 								",
-		"//" : "             										",
-		"//" : "        if (globalData.funders[0] != 0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b)	",
-		"//" : "            return false; 								",
-		"//" : "    } 											",
-		"//" : "}											",
+		"//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/stZeroKnowledge/pairingTestFiller.json b/src/GeneralStateTestsFiller/stZeroKnowledge/pairingTestFiller.json
index d277c5d66..ad31e0483 100644
--- a/src/GeneralStateTestsFiller/stZeroKnowledge/pairingTestFiller.json
+++ b/src/GeneralStateTestsFiller/stZeroKnowledge/pairingTestFiller.json
@@ -69,8 +69,8 @@
             },
 	    "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "",
-		"code" : "zeroCash transaction data",
-		"code" : "inputLength, data1, data2, data3, ...",
+		"//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" : {
@@ -78,7 +78,7 @@
             },
 	    "c94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "",
-		"code" : "NEGATE",
+		"//comment1" : "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" : "",
-		"code" : "ADD",
+		"//comment1" : "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" : {
@@ -130,7 +130,7 @@
 		"[1] vk.B + proof.B + negateG1(proof.Bp) + P2",
 		"[2] proof.C + vk.C + negateG1(proof.Cp) + P2",
 		"[3] proof.K + vk.gamma + negateG1(addG1(vkx, addG1(proof.A, proof.C))) + vk.gammaBeta2 + negateG1(vk.gammaBeta1) + proof.B",
-		"[4] addG1(vkx, proof.A) + proof.B + negateG1(proof.H) + vk.Z +	negateG1(proof.C) + P2",
+		"[4] addG1(vkx, proof.A) + proof.B + negateG1(proof.H) + vk.Z + negateG1(proof.C) + P2",
 		"[5] proof.A + vk.A + proof.Ap + P2"
 	    ],
             "data" : [