diff --git a/examples/httpserver2.nim b/examples/httpserver2.nim
index 56bd630ad..45c57a755 100755
--- a/examples/httpserver2.nim
+++ b/examples/httpserver2.nim
@@ -135,7 +135,7 @@ proc executeCgi(server: var TServer, client: TSocket, path, query: string,
       dealloc(buf)
       OSError()
     var inp = process.inputStream
-    inp.writeData(inp, buf, contentLength)
+    inp.writeData(buf, contentLength)
     dealloc(buf)
 
 proc animate(server: var TServer) =
diff --git a/tests/accept/compile/mrecmod.nim b/tests/compile/mrecmod.nim
index fab9654d5..fab9654d5 100755
--- a/tests/accept/compile/mrecmod.nim
+++ b/tests/compile/mrecmod.nim
diff --git a/tests/accept/compile/mrecmod2.nim b/tests/compile/mrecmod2.nim
index 9557ce729..9557ce729 100755
--- a/tests/accept/compile/mrecmod2.nim
+++ b/tests/compile/mrecmod2.nim
diff --git a/tests/accept/compile/mtempl5.nim b/tests/compile/mtempl5.nim
index 51e8461b8..51e8461b8 100644
--- a/tests/accept/compile/mtempl5.nim
+++ b/tests/compile/mtempl5.nim
diff --git a/tests/accept/compile/mvarious.nim b/tests/compile/mvarious.nim
index 333b34d33..333b34d33 100755
--- a/tests/accept/compile/mvarious.nim
+++ b/tests/compile/mvarious.nim
diff --git a/tests/accept/compile/sunset.tmpl b/tests/compile/sunset.tmpl
index 6475bac4e..6475bac4e 100755
--- a/tests/accept/compile/sunset.tmpl
+++ b/tests/compile/sunset.tmpl
diff --git a/tests/accept/compile/tambsym2.nim b/tests/compile/tambsym2.nim
index ecd9a4784..ecd9a4784 100755
--- a/tests/accept/compile/tambsym2.nim
+++ b/tests/compile/tambsym2.nim
diff --git a/tests/accept/compile/tarrindx.nim b/tests/compile/tarrindx.nim
index 13919cc2c..13919cc2c 100755
--- a/tests/accept/compile/tarrindx.nim
+++ b/tests/compile/tarrindx.nim
diff --git a/tests/accept/compile/tassign.nim b/tests/compile/tassign.nim
index f51c20783..f51c20783 100755
--- a/tests/accept/compile/tassign.nim
+++ b/tests/compile/tassign.nim
diff --git a/tests/accept/compile/tcan_alias_generic.nim b/tests/compile/tcan_alias_generic.nim
index e90bdc6d2..e90bdc6d2 100755
--- a/tests/accept/compile/tcan_alias_generic.nim
+++ b/tests/compile/tcan_alias_generic.nim
diff --git a/tests/accept/compile/tcan_alias_specialised_generic.nim b/tests/compile/tcan_alias_specialised_generic.nim
index a8f1972c8..a8f1972c8 100755
--- a/tests/accept/compile/tcan_alias_specialised_generic.nim
+++ b/tests/compile/tcan_alias_specialised_generic.nim
diff --git a/tests/accept/compile/tcan_inherit_generic.nim b/tests/compile/tcan_inherit_generic.nim
index 76d9fab1f..76d9fab1f 100755
--- a/tests/accept/compile/tcan_inherit_generic.nim
+++ b/tests/compile/tcan_inherit_generic.nim
diff --git a/tests/accept/compile/tcan_specialise_generic.nim b/tests/compile/tcan_specialise_generic.nim
index f98a8bf95..f98a8bf95 100755
--- a/tests/accept/compile/tcan_specialise_generic.nim
+++ b/tests/compile/tcan_specialise_generic.nim
diff --git a/tests/accept/compile/tccgen1.nim b/tests/compile/tccgen1.nim
index b1d8835f2..b1d8835f2 100755
--- a/tests/accept/compile/tccgen1.nim
+++ b/tests/compile/tccgen1.nim
diff --git a/tests/accept/compile/tcmdline.nim b/tests/compile/tcmdline.nim
index f4ee20d31..f4ee20d31 100755
--- a/tests/accept/compile/tcmdline.nim
+++ b/tests/compile/tcmdline.nim
diff --git a/tests/accept/compile/tcodegenbug1.nim b/tests/compile/tcodegenbug1.nim
index 909101db1..909101db1 100755
--- a/tests/accept/compile/tcodegenbug1.nim
+++ b/tests/compile/tcodegenbug1.nim
diff --git a/tests/accept/compile/tcolors.nim b/tests/compile/tcolors.nim
index 9d1034405..9d1034405 100755
--- a/tests/accept/compile/tcolors.nim
+++ b/tests/compile/tcolors.nim
diff --git a/tests/accept/compile/tconsteval.nim b/tests/compile/tconsteval.nim
index dcc7080ea..dcc7080ea 100755
--- a/tests/accept/compile/tconsteval.nim
+++ b/tests/compile/tconsteval.nim
diff --git a/tests/accept/compile/tconstraints.nim b/tests/compile/tconstraints.nim
index 7aef0d645..7aef0d645 100755
--- a/tests/accept/compile/tconstraints.nim
+++ b/tests/compile/tconstraints.nim
diff --git a/tests/accept/compile/tconvcolors.nim b/tests/compile/tconvcolors.nim
index 07e829550..07e829550 100755
--- a/tests/accept/compile/tconvcolors.nim
+++ b/tests/compile/tconvcolors.nim
diff --git a/tests/accept/compile/tconvert.nim b/tests/compile/tconvert.nim
index f96cf2688..f96cf2688 100755
--- a/tests/accept/compile/tconvert.nim
+++ b/tests/compile/tconvert.nim
diff --git a/tests/accept/compile/tcputime.nim b/tests/compile/tcputime.nim
index 2fc46ee64..2fc46ee64 100755
--- a/tests/accept/compile/tcputime.nim
+++ b/tests/compile/tcputime.nim
diff --git a/tests/accept/compile/tdialogs.nim b/tests/compile/tdialogs.nim
index d161a976d..d161a976d 100755
--- a/tests/accept/compile/tdialogs.nim
+++ b/tests/compile/tdialogs.nim
diff --git a/tests/accept/compile/tdictdestruct.nim b/tests/compile/tdictdestruct.nim
index 09e173b7c..09e173b7c 100755
--- a/tests/accept/compile/tdictdestruct.nim
+++ b/tests/compile/tdictdestruct.nim
diff --git a/tests/accept/compile/tdiscardable.nim b/tests/compile/tdiscardable.nim
index c0551ba2f..c0551ba2f 100644
--- a/tests/accept/compile/tdiscardable.nim
+++ b/tests/compile/tdiscardable.nim
diff --git a/tests/accept/compile/tdllvar.nim b/tests/compile/tdllvar.nim
index ab767770c..ab767770c 100755
--- a/tests/accept/compile/tdllvar.nim
+++ b/tests/compile/tdllvar.nim
diff --git a/tests/accept/compile/tdumpast.nim b/tests/compile/tdumpast.nim
index d044e1da1..d044e1da1 100755
--- a/tests/accept/compile/tdumpast.nim
+++ b/tests/compile/tdumpast.nim
diff --git a/tests/accept/compile/tdumpast2.nim b/tests/compile/tdumpast2.nim
index fb31af0ec..fb31af0ec 100644
--- a/tests/accept/compile/tdumpast2.nim
+++ b/tests/compile/tdumpast2.nim
diff --git a/tests/accept/compile/techo.nim b/tests/compile/techo.nim
index 0fa4b5fe0..0fa4b5fe0 100755
--- a/tests/accept/compile/techo.nim
+++ b/tests/compile/techo.nim
diff --git a/tests/accept/compile/temptyecho.nim b/tests/compile/temptyecho.nim
index 5f1aa6515..5f1aa6515 100755
--- a/tests/accept/compile/temptyecho.nim
+++ b/tests/compile/temptyecho.nim
diff --git a/tests/accept/compile/tendian.nim b/tests/compile/tendian.nim
index 256e2653c..256e2653c 100755
--- a/tests/accept/compile/tendian.nim
+++ b/tests/compile/tendian.nim
diff --git a/tests/accept/compile/tenum.nim b/tests/compile/tenum.nim
index 6e53b9c08..6e53b9c08 100755
--- a/tests/accept/compile/tenum.nim
+++ b/tests/compile/tenum.nim
diff --git a/tests/accept/compile/tenum2.nim b/tests/compile/tenum2.nim
index feba36dd6..feba36dd6 100755
--- a/tests/accept/compile/tenum2.nim
+++ b/tests/compile/tenum2.nim
diff --git a/tests/accept/compile/tenum3.nim b/tests/compile/tenum3.nim
index 09a516932..09a516932 100755
--- a/tests/accept/compile/tenum3.nim
+++ b/tests/compile/tenum3.nim
diff --git a/tests/accept/compile/teval1.nim b/tests/compile/teval1.nim
index 8172ebe28..8172ebe28 100755
--- a/tests/accept/compile/teval1.nim
+++ b/tests/compile/teval1.nim
diff --git a/tests/accept/compile/tfib.nim b/tests/compile/tfib.nim
index 09a4d5038..09a4d5038 100755
--- a/tests/accept/compile/tfib.nim
+++ b/tests/compile/tfib.nim
diff --git a/tests/accept/compile/tforwardgeneric.nim b/tests/compile/tforwardgeneric.nim
index 84bef15cc..84bef15cc 100644
--- a/tests/accept/compile/tforwardgeneric.nim
+++ b/tests/compile/tforwardgeneric.nim
diff --git a/tests/accept/compile/tforwty.nim b/tests/compile/tforwty.nim
index 0f1d3697f..0f1d3697f 100755
--- a/tests/accept/compile/tforwty.nim
+++ b/tests/compile/tforwty.nim
diff --git a/tests/accept/compile/tforwty2.nim b/tests/compile/tforwty2.nim
index 5d15e112a..5d15e112a 100755
--- a/tests/accept/compile/tforwty2.nim
+++ b/tests/compile/tforwty2.nim
diff --git a/tests/accept/compile/tgenericmatcher.nim b/tests/compile/tgenericmatcher.nim
index 6ff0dd505..6ff0dd505 100755
--- a/tests/accept/compile/tgenericmatcher.nim
+++ b/tests/compile/tgenericmatcher.nim
diff --git a/tests/accept/compile/tgenericmatcher2.nim b/tests/compile/tgenericmatcher2.nim
index aa2f9dbb3..aa2f9dbb3 100755
--- a/tests/accept/compile/tgenericmatcher2.nim
+++ b/tests/compile/tgenericmatcher2.nim
diff --git a/tests/accept/compile/tgenericprocvar.nim b/tests/compile/tgenericprocvar.nim
index 7825db4c3..7825db4c3 100755
--- a/tests/accept/compile/tgenericprocvar.nim
+++ b/tests/compile/tgenericprocvar.nim
diff --git a/tests/accept/compile/tgenericrefs.nim b/tests/compile/tgenericrefs.nim
index 3b7940098..3b7940098 100755
--- a/tests/accept/compile/tgenericrefs.nim
+++ b/tests/compile/tgenericrefs.nim
diff --git a/tests/accept/compile/tgenericvariant.nim b/tests/compile/tgenericvariant.nim
index 51d01355a..51d01355a 100755
--- a/tests/accept/compile/tgenericvariant.nim
+++ b/tests/compile/tgenericvariant.nim
diff --git a/tests/accept/compile/tgetstartmilsecs.nim b/tests/compile/tgetstartmilsecs.nim
index 5a3368e0f..5a3368e0f 100755
--- a/tests/accept/compile/tgetstartmilsecs.nim
+++ b/tests/compile/tgetstartmilsecs.nim
diff --git a/tests/accept/compile/tgtk.nim b/tests/compile/tgtk.nim
index 7febb0ab8..7febb0ab8 100755
--- a/tests/accept/compile/tgtk.nim
+++ b/tests/compile/tgtk.nim
diff --git a/tests/accept/compile/thallo.nim b/tests/compile/thallo.nim
index ff90c5c0a..ff90c5c0a 100755
--- a/tests/accept/compile/thallo.nim
+++ b/tests/compile/thallo.nim
diff --git a/tests/accept/compile/thexrange.nim b/tests/compile/thexrange.nim
index 875a5bab3..875a5bab3 100755
--- a/tests/accept/compile/thexrange.nim
+++ b/tests/compile/thexrange.nim
diff --git a/tests/accept/compile/tident.nim b/tests/compile/tident.nim
index 1ed9894c6..1ed9894c6 100755
--- a/tests/accept/compile/tident.nim
+++ b/tests/compile/tident.nim
diff --git a/tests/accept/compile/tindent1.nim b/tests/compile/tindent1.nim
index 0527b6e57..0527b6e57 100755
--- a/tests/accept/compile/tindent1.nim
+++ b/tests/compile/tindent1.nim
diff --git a/tests/accept/compile/tio.nim b/tests/compile/tio.nim
index 5ae119f77..5ae119f77 100755
--- a/tests/accept/compile/tio.nim
+++ b/tests/compile/tio.nim
diff --git a/tests/accept/compile/titer.nim b/tests/compile/titer.nim
index 19a11dc4e..19a11dc4e 100755
--- a/tests/accept/compile/titer.nim
+++ b/tests/compile/titer.nim
diff --git a/tests/accept/compile/titer2.nim b/tests/compile/titer2.nim
index dab2713e8..dab2713e8 100755
--- a/tests/accept/compile/titer2.nim
+++ b/tests/compile/titer2.nim
diff --git a/tests/accept/compile/titer_no_tuple_unpack.nim b/tests/compile/titer_no_tuple_unpack.nim
index da5e1bc46..da5e1bc46 100755
--- a/tests/accept/compile/titer_no_tuple_unpack.nim
+++ b/tests/compile/titer_no_tuple_unpack.nim
diff --git a/tests/accept/compile/tlastmod.nim b/tests/compile/tlastmod.nim
index 75b047fc8..75b047fc8 100755
--- a/tests/accept/compile/tlastmod.nim
+++ b/tests/compile/tlastmod.nim
diff --git a/tests/accept/compile/tlexer.nim b/tests/compile/tlexer.nim
index 10a8ab51d..10a8ab51d 100755
--- a/tests/accept/compile/tlexer.nim
+++ b/tests/compile/tlexer.nim
diff --git a/tests/accept/compile/tlibs.nim b/tests/compile/tlibs.nim
index 5dd70b0e8..5dd70b0e8 100755
--- a/tests/accept/compile/tlibs.nim
+++ b/tests/compile/tlibs.nim
diff --git a/tests/accept/compile/tlinearscanend.nim b/tests/compile/tlinearscanend.nim
index 15fd0c70a..15fd0c70a 100755
--- a/tests/accept/compile/tlinearscanend.nim
+++ b/tests/compile/tlinearscanend.nim
diff --git a/tests/accept/compile/tloops.nim b/tests/compile/tloops.nim
index 74a3992c9..74a3992c9 100755
--- a/tests/accept/compile/tloops.nim
+++ b/tests/compile/tloops.nim
diff --git a/tests/accept/compile/tmacro1.nim b/tests/compile/tmacro1.nim
index e96997c47..e96997c47 100755
--- a/tests/accept/compile/tmacro1.nim
+++ b/tests/compile/tmacro1.nim
diff --git a/tests/accept/compile/tmacrostmt.nim b/tests/compile/tmacrostmt.nim
index 5d1403dac..5d1403dac 100755
--- a/tests/accept/compile/tmacrostmt.nim
+++ b/tests/compile/tmacrostmt.nim
diff --git a/tests/accept/compile/tmandelbrot.nim b/tests/compile/tmandelbrot.nim
index 54724d247..54724d247 100644
--- a/tests/accept/compile/tmandelbrot.nim
+++ b/tests/compile/tmandelbrot.nim
diff --git a/tests/accept/compile/tmarshal.nim b/tests/compile/tmarshal.nim
index 5471d347a..5471d347a 100755
--- a/tests/accept/compile/tmarshal.nim
+++ b/tests/compile/tmarshal.nim
diff --git a/tests/accept/compile/tmath.nim b/tests/compile/tmath.nim
index 6a1dae54d..6a1dae54d 100755
--- a/tests/accept/compile/tmath.nim
+++ b/tests/compile/tmath.nim
diff --git a/tests/accept/compile/tmodulealias.nim b/tests/compile/tmodulealias.nim
index a7d155e51..a7d155e51 100755
--- a/tests/accept/compile/tmodulealias.nim
+++ b/tests/compile/tmodulealias.nim
diff --git a/tests/accept/compile/tnamedparams.nim b/tests/compile/tnamedparams.nim
index 4b0cd5361..4b0cd5361 100755
--- a/tests/accept/compile/tnamedparams.nim
+++ b/tests/compile/tnamedparams.nim
diff --git a/tests/accept/compile/tnestedproc.nim b/tests/compile/tnestedproc.nim
index 49ec6f9a7..49ec6f9a7 100644
--- a/tests/accept/compile/tnestedproc.nim
+++ b/tests/compile/tnestedproc.nim
diff --git a/tests/accept/compile/tnew.nim b/tests/compile/tnew.nim
index 6527541a2..6527541a2 100755
--- a/tests/accept/compile/tnew.nim
+++ b/tests/compile/tnew.nim
diff --git a/tests/accept/compile/tnewlibs.nim b/tests/compile/tnewlibs.nim
index aca2e3c30..aca2e3c30 100755
--- a/tests/accept/compile/tnewlibs.nim
+++ b/tests/compile/tnewlibs.nim
diff --git a/tests/accept/compile/tnewsets.nim b/tests/compile/tnewsets.nim
index 415fe8f7e..415fe8f7e 100755
--- a/tests/accept/compile/tnewsets.nim
+++ b/tests/compile/tnewsets.nim
diff --git a/tests/accept/compile/tnewuns.nim b/tests/compile/tnewuns.nim
index 5181e467c..5181e467c 100755
--- a/tests/accept/compile/tnewuns.nim
+++ b/tests/compile/tnewuns.nim
diff --git a/tests/accept/compile/tnimrodnode_for_runtime.nim b/tests/compile/tnimrodnode_for_runtime.nim
index e73c8430f..e73c8430f 100755
--- a/tests/accept/compile/tnimrodnode_for_runtime.nim
+++ b/tests/compile/tnimrodnode_for_runtime.nim
diff --git a/tests/accept/compile/tnoargopenarray.nim b/tests/compile/tnoargopenarray.nim
index 872ec86d2..872ec86d2 100755
--- a/tests/accept/compile/tnoargopenarray.nim
+++ b/tests/compile/tnoargopenarray.nim
diff --git a/tests/accept/compile/tobjcov.nim b/tests/compile/tobjcov.nim
index 17bc8d80d..17bc8d80d 100755
--- a/tests/accept/compile/tobjcov.nim
+++ b/tests/compile/tobjcov.nim
diff --git a/tests/accept/compile/tobject2.nim b/tests/compile/tobject2.nim
index 8f69a6bac..8f69a6bac 100755
--- a/tests/accept/compile/tobject2.nim
+++ b/tests/compile/tobject2.nim
diff --git a/tests/accept/compile/tobjects.nim b/tests/compile/tobjects.nim
index 8305e2838..8305e2838 100755
--- a/tests/accept/compile/tobjects.nim
+++ b/tests/compile/tobjects.nim
diff --git a/tests/accept/compile/toop.nim b/tests/compile/toop.nim
index db6d9e595..db6d9e595 100755
--- a/tests/accept/compile/toop.nim
+++ b/tests/compile/toop.nim
diff --git a/tests/accept/compile/toptions.nim b/tests/compile/toptions.nim
index 95bb5cfbc..95bb5cfbc 100755
--- a/tests/accept/compile/toptions.nim
+++ b/tests/compile/toptions.nim
diff --git a/tests/accept/compile/tos.nim b/tests/compile/tos.nim
index fa9993cc9..fa9993cc9 100755
--- a/tests/accept/compile/tos.nim
+++ b/tests/compile/tos.nim
diff --git a/tests/accept/compile/toverprc.nim b/tests/compile/toverprc.nim
index 43271b684..43271b684 100755
--- a/tests/accept/compile/toverprc.nim
+++ b/tests/compile/toverprc.nim
diff --git a/tests/accept/compile/tparedef.nim b/tests/compile/tparedef.nim
index dedebf6b7..dedebf6b7 100755
--- a/tests/accept/compile/tparedef.nim
+++ b/tests/compile/tparedef.nim
diff --git a/tests/accept/compile/tparscfg.nim b/tests/compile/tparscfg.nim
index 618ecadd6..618ecadd6 100755
--- a/tests/accept/compile/tparscfg.nim
+++ b/tests/compile/tparscfg.nim
diff --git a/tests/accept/compile/tparsefloat.nim b/tests/compile/tparsefloat.nim
index 38ed2db6d..38ed2db6d 100755
--- a/tests/accept/compile/tparsefloat.nim
+++ b/tests/compile/tparsefloat.nim
diff --git a/tests/accept/compile/tparsopt.nim b/tests/compile/tparsopt.nim
index 2b2da7e51..2b2da7e51 100755
--- a/tests/accept/compile/tparsopt.nim
+++ b/tests/compile/tparsopt.nim
diff --git a/tests/accept/compile/tposix.nim b/tests/compile/tposix.nim
index bf0b49586..bf0b49586 100755
--- a/tests/accept/compile/tposix.nim
+++ b/tests/compile/tposix.nim
diff --git a/tests/accept/compile/tprep.nim b/tests/compile/tprep.nim
index 4ef9e2543..4ef9e2543 100755
--- a/tests/accept/compile/tprep.nim
+++ b/tests/compile/tprep.nim
diff --git a/tests/accept/compile/tpush.nim b/tests/compile/tpush.nim
index 5fb411a79..5fb411a79 100755
--- a/tests/accept/compile/tpush.nim
+++ b/tests/compile/tpush.nim
diff --git a/tests/accept/compile/tquicksort.nim b/tests/compile/tquicksort.nim
index 6706a185e..6706a185e 100755
--- a/tests/accept/compile/tquicksort.nim
+++ b/tests/compile/tquicksort.nim
diff --git a/tests/accept/compile/tquit.nim b/tests/compile/tquit.nim
index d4dc1522d..d4dc1522d 100755
--- a/tests/accept/compile/tquit.nim
+++ b/tests/compile/tquit.nim
diff --git a/tests/accept/compile/tradix.nim b/tests/compile/tradix.nim
index e7ca210e4..e7ca210e4 100755
--- a/tests/accept/compile/tradix.nim
+++ b/tests/compile/tradix.nim
diff --git a/tests/accept/compile/treadln.nim b/tests/compile/treadln.nim
index 1117ab5f9..1117ab5f9 100755
--- a/tests/accept/compile/treadln.nim
+++ b/tests/compile/treadln.nim
diff --git a/tests/accept/compile/treadx.nim b/tests/compile/treadx.nim
index 13acb0514..13acb0514 100755
--- a/tests/accept/compile/treadx.nim
+++ b/tests/compile/treadx.nim
diff --git a/tests/accept/compile/trecmod.nim b/tests/compile/trecmod.nim
index 9d39d3ff7..9d39d3ff7 100755
--- a/tests/accept/compile/trecmod.nim
+++ b/tests/compile/trecmod.nim
diff --git a/tests/accept/compile/trecmod2.nim b/tests/compile/trecmod2.nim
index 85fe2215f..85fe2215f 100755
--- a/tests/accept/compile/trecmod2.nim
+++ b/tests/compile/trecmod2.nim
diff --git a/tests/accept/compile/trectuple.nim b/tests/compile/trectuple.nim
index 4d5febbfa..4d5febbfa 100755
--- a/tests/accept/compile/trectuple.nim
+++ b/tests/compile/trectuple.nim
diff --git a/tests/accept/compile/trectuples.nim b/tests/compile/trectuples.nim
index c59cfe880..c59cfe880 100644
--- a/tests/accept/compile/trectuples.nim
+++ b/tests/compile/trectuples.nim
diff --git a/tests/accept/compile/trepr.nim b/tests/compile/trepr.nim
index b15081e48..b15081e48 100755
--- a/tests/accept/compile/trepr.nim
+++ b/tests/compile/trepr.nim
diff --git a/tests/accept/compile/tseq2.nim b/tests/compile/tseq2.nim
index 03bdb3fab..03bdb3fab 100755
--- a/tests/accept/compile/tseq2.nim
+++ b/tests/compile/tseq2.nim
diff --git a/tests/accept/compile/tseqcon2.nim b/tests/compile/tseqcon2.nim
index 4f2763ffe..4f2763ffe 100755
--- a/tests/accept/compile/tseqcon2.nim
+++ b/tests/compile/tseqcon2.nim
diff --git a/tests/accept/compile/tshadow_magic_type.nim b/tests/compile/tshadow_magic_type.nim
index 5cd27435e..5cd27435e 100755
--- a/tests/accept/compile/tshadow_magic_type.nim
+++ b/tests/compile/tshadow_magic_type.nim
diff --git a/tests/accept/compile/tsizeof.nim b/tests/compile/tsizeof.nim
index f7b70dd4d..f7b70dd4d 100755
--- a/tests/accept/compile/tsizeof.nim
+++ b/tests/compile/tsizeof.nim
diff --git a/tests/accept/compile/tslurp.nim b/tests/compile/tslurp.nim
index c99fefe23..c99fefe23 100644
--- a/tests/accept/compile/tslurp.nim
+++ b/tests/compile/tslurp.nim
diff --git a/tests/accept/compile/tsockets.nim b/tests/compile/tsockets.nim
index cc7d18b87..cc7d18b87 100755
--- a/tests/accept/compile/tsockets.nim
+++ b/tests/compile/tsockets.nim
diff --git a/tests/accept/compile/tsortdev.nim b/tests/compile/tsortdev.nim
index c4e63fab4..c4e63fab4 100755
--- a/tests/accept/compile/tsortdev.nim
+++ b/tests/compile/tsortdev.nim
diff --git a/tests/accept/compile/tspecialised_is_equivalent.nim b/tests/compile/tspecialised_is_equivalent.nim
index 60b976e90..60b976e90 100755
--- a/tests/accept/compile/tspecialised_is_equivalent.nim
+++ b/tests/compile/tspecialised_is_equivalent.nim
diff --git a/tests/accept/compile/tstrace.nim b/tests/compile/tstrace.nim
index 3032a34a3..3032a34a3 100755
--- a/tests/accept/compile/tstrace.nim
+++ b/tests/compile/tstrace.nim
diff --git a/tests/accept/compile/tstrdesc.nim b/tests/compile/tstrdesc.nim
index 1c2e85b4b..1c2e85b4b 100755
--- a/tests/accept/compile/tstrdesc.nim
+++ b/tests/compile/tstrdesc.nim
diff --git a/tests/accept/compile/tstrdist.nim b/tests/compile/tstrdist.nim
index 3e1939e73..3e1939e73 100755
--- a/tests/accept/compile/tstrdist.nim
+++ b/tests/compile/tstrdist.nim
diff --git a/tests/accept/compile/tstreams.nim b/tests/compile/tstreams.nim
index 640565a27..640565a27 100755
--- a/tests/accept/compile/tstreams.nim
+++ b/tests/compile/tstreams.nim
diff --git a/tests/accept/compile/tstrset.nim b/tests/compile/tstrset.nim
index e19ccee4d..e19ccee4d 100755
--- a/tests/accept/compile/tstrset.nim
+++ b/tests/compile/tstrset.nim
diff --git a/tests/accept/compile/tstrtabs.nim b/tests/compile/tstrtabs.nim
index 251ec77ef..251ec77ef 100755
--- a/tests/accept/compile/tstrtabs.nim
+++ b/tests/compile/tstrtabs.nim
diff --git a/tests/accept/compile/ttableconstr.nim b/tests/compile/ttableconstr.nim
index 9433e9985..9433e9985 100755
--- a/tests/accept/compile/ttableconstr.nim
+++ b/tests/compile/ttableconstr.nim
diff --git a/tests/accept/compile/ttempl.nim b/tests/compile/ttempl.nim
index 2c4785325..2c4785325 100755
--- a/tests/accept/compile/ttempl.nim
+++ b/tests/compile/ttempl.nim
diff --git a/tests/accept/compile/ttempl3.nim b/tests/compile/ttempl3.nim
index 7b2c70f79..7b2c70f79 100755
--- a/tests/accept/compile/ttempl3.nim
+++ b/tests/compile/ttempl3.nim
diff --git a/tests/accept/compile/ttempl4.nim b/tests/compile/ttempl4.nim
index a5ad2000f..a5ad2000f 100755
--- a/tests/accept/compile/ttempl4.nim
+++ b/tests/compile/ttempl4.nim
diff --git a/tests/accept/compile/ttempl5.nim b/tests/compile/ttempl5.nim
index 85692e97b..85692e97b 100644
--- a/tests/accept/compile/ttempl5.nim
+++ b/tests/compile/ttempl5.nim
diff --git a/tests/accept/compile/ttemplreturntype.nim b/tests/compile/ttemplreturntype.nim
index 642fa1b72..642fa1b72 100755
--- a/tests/accept/compile/ttemplreturntype.nim
+++ b/tests/compile/ttemplreturntype.nim
diff --git a/tests/accept/compile/tthread_generic.nim b/tests/compile/tthread_generic.nim
index beae4b652..beae4b652 100644
--- a/tests/accept/compile/tthread_generic.nim
+++ b/tests/compile/tthread_generic.nim
diff --git a/tests/accept/compile/ttime.nim b/tests/compile/ttime.nim
index bad818816..bad818816 100755
--- a/tests/accept/compile/ttime.nim
+++ b/tests/compile/ttime.nim
diff --git a/tests/accept/compile/ttuple1.nim b/tests/compile/ttuple1.nim
index 5787cc309..5787cc309 100755
--- a/tests/accept/compile/ttuple1.nim
+++ b/tests/compile/ttuple1.nim
diff --git a/tests/accept/compile/ttypeconverter1.nim b/tests/compile/ttypeconverter1.nim
index b9a5e88ae..b9a5e88ae 100755
--- a/tests/accept/compile/ttypeconverter1.nim
+++ b/tests/compile/ttypeconverter1.nim
diff --git a/tests/accept/compile/ttypeselectors.nim b/tests/compile/ttypeselectors.nim
index 1cc4b02b7..1cc4b02b7 100644
--- a/tests/accept/compile/ttypeselectors.nim
+++ b/tests/compile/ttypeselectors.nim
diff --git a/tests/accept/compile/tuserpragma.nim b/tests/compile/tuserpragma.nim
index 784baa176..784baa176 100755
--- a/tests/accept/compile/tuserpragma.nim
+++ b/tests/compile/tuserpragma.nim
diff --git a/tests/accept/compile/tvarious.nim b/tests/compile/tvarious.nim
index 52dd46184..52dd46184 100755
--- a/tests/accept/compile/tvarious.nim
+++ b/tests/compile/tvarious.nim
diff --git a/tests/accept/compile/tvoid.nim b/tests/compile/tvoid.nim
index b286010dc..b286010dc 100644
--- a/tests/accept/compile/tvoid.nim
+++ b/tests/compile/tvoid.nim
diff --git a/tests/accept/compile/twalker.nim b/tests/compile/twalker.nim
index 3fdd8769b..3fdd8769b 100755
--- a/tests/accept/compile/twalker.nim
+++ b/tests/compile/twalker.nim
diff --git a/tests/accept/compile/typalias.nim b/tests/compile/typalias.nim
index ba9f38ed9..ba9f38ed9 100755
--- a/tests/accept/compile/typalias.nim
+++ b/tests/compile/typalias.nim
diff --git a/tests/gc/gcbench.nim b/tests/gc/gcbench.nim
index 66164a9e9..253b74805 100755
--- a/tests/gc/gcbench.nim
+++ b/tests/gc/gcbench.nim
@@ -100,13 +100,12 @@ proc PrintDiagnostics() =
 proc TimeConstruction(depth: int) =

   var

     root, tempTree: PNode

-    t: int

     iNumIters: int

 

   iNumIters = NumIters(depth)

 

   echo("Creating " & $iNumIters & " trees of depth " & $depth)

-  t = epochTime()

+  var t = epochTime()

   for i in 0..iNumIters-1:

     new(tempTree)

     Populate(depth, tempTree)

@@ -124,13 +123,12 @@ type
 proc main() =

   var

     root, longLivedTree, tempTree: PNode

-    t: int

     myarray: tMyArray

 

   echo("Garbage Collector Test")

   echo(" Stretching memory with a binary tree of depth " & $kStretchTreeDepth)

   PrintDiagnostics()

-  t = epochTime()

+  var t = epochTime()

 

   # Stretch the memory space quickly

   tempTree = MakeTree(kStretchTreeDepth)

diff --git a/tests/accept/run/mambsys1.nim b/tests/run/mambsys1.nim
index 5472b5ae4..5472b5ae4 100755
--- a/tests/accept/run/mambsys1.nim
+++ b/tests/run/mambsys1.nim
diff --git a/tests/accept/run/mambsys2.nim b/tests/run/mambsys2.nim
index 395425b86..395425b86 100755
--- a/tests/accept/run/mambsys2.nim
+++ b/tests/run/mambsys2.nim
diff --git a/tests/accept/run/mbind3.nim b/tests/run/mbind3.nim
index d02bc79d0..d02bc79d0 100755
--- a/tests/accept/run/mbind3.nim
+++ b/tests/run/mbind3.nim
diff --git a/tests/accept/run/mfriends.nim b/tests/run/mfriends.nim
index f1c663655..f1c663655 100644
--- a/tests/accept/run/mfriends.nim
+++ b/tests/run/mfriends.nim
diff --git a/tests/accept/run/minit.nim b/tests/run/minit.nim
index 75fcebb77..75fcebb77 100755
--- a/tests/accept/run/minit.nim
+++ b/tests/run/minit.nim
diff --git a/tests/accept/run/mmultim3.nim b/tests/run/mmultim3.nim
index ca73ebea6..ca73ebea6 100755
--- a/tests/accept/run/mmultim3.nim
+++ b/tests/run/mmultim3.nim
diff --git a/tests/accept/run/tack.nim b/tests/run/tack.nim
index 680ff567e..680ff567e 100755
--- a/tests/accept/run/tack.nim
+++ b/tests/run/tack.nim
diff --git a/tests/accept/run/tactiontable.nim b/tests/run/tactiontable.nim
index e2f19a099..e2f19a099 100644
--- a/tests/accept/run/tactiontable.nim
+++ b/tests/run/tactiontable.nim
diff --git a/tests/accept/run/tambsym2.nim b/tests/run/tambsym2.nim
index 745427c54..745427c54 100755
--- a/tests/accept/run/tambsym2.nim
+++ b/tests/run/tambsym2.nim
diff --git a/tests/accept/run/tambsys.nim b/tests/run/tambsys.nim
index a88615866..a88615866 100755
--- a/tests/accept/run/tambsys.nim
+++ b/tests/run/tambsys.nim
diff --git a/tests/accept/run/tanontuples.nim b/tests/run/tanontuples.nim
index a2babf038..a2babf038 100644
--- a/tests/accept/run/tanontuples.nim
+++ b/tests/run/tanontuples.nim
diff --git a/tests/accept/run/tarray.nim b/tests/run/tarray.nim
index 16ef558d1..16ef558d1 100755
--- a/tests/accept/run/tarray.nim
+++ b/tests/run/tarray.nim
diff --git a/tests/accept/run/tarray2.nim b/tests/run/tarray2.nim
index 048f51795..048f51795 100755
--- a/tests/accept/run/tarray2.nim
+++ b/tests/run/tarray2.nim
diff --git a/tests/accept/run/tarray3.nim b/tests/run/tarray3.nim
index d28778357..d28778357 100755
--- a/tests/accept/run/tarray3.nim
+++ b/tests/run/tarray3.nim
diff --git a/tests/accept/run/tarraycons.nim b/tests/run/tarraycons.nim
index 0b2a42c2f..0b2a42c2f 100755
--- a/tests/accept/run/tarraycons.nim
+++ b/tests/run/tarraycons.nim
diff --git a/tests/accept/run/tassert.nim b/tests/run/tassert.nim
index 0ea8d2034..0ea8d2034 100755
--- a/tests/accept/run/tassert.nim
+++ b/tests/run/tassert.nim
diff --git a/tests/accept/run/tbind1.nim b/tests/run/tbind1.nim
index 6593b2307..6593b2307 100755
--- a/tests/accept/run/tbind1.nim
+++ b/tests/run/tbind1.nim
diff --git a/tests/accept/run/tbind3.nim b/tests/run/tbind3.nim
index 551acc10f..551acc10f 100755
--- a/tests/accept/run/tbind3.nim
+++ b/tests/run/tbind3.nim
diff --git a/tests/accept/run/tbintre2.nim b/tests/run/tbintre2.nim
index 2a7225411..2a7225411 100755
--- a/tests/accept/run/tbintre2.nim
+++ b/tests/run/tbintre2.nim
diff --git a/tests/accept/run/tbintree.nim b/tests/run/tbintree.nim
index 8cc8acb82..8cc8acb82 100755
--- a/tests/accept/run/tbintree.nim
+++ b/tests/run/tbintree.nim
diff --git a/tests/accept/run/tbug499771.nim b/tests/run/tbug499771.nim
index 633ab39f6..633ab39f6 100755
--- a/tests/accept/run/tbug499771.nim
+++ b/tests/run/tbug499771.nim
diff --git a/tests/accept/run/tbug511622.nim b/tests/run/tbug511622.nim
index a5360423d..a5360423d 100755
--- a/tests/accept/run/tbug511622.nim
+++ b/tests/run/tbug511622.nim
diff --git a/tests/accept/run/tcase_setconstr.nim b/tests/run/tcase_setconstr.nim
index 21f657c2b..21f657c2b 100755
--- a/tests/accept/run/tcase_setconstr.nim
+++ b/tests/run/tcase_setconstr.nim
diff --git a/tests/accept/run/tcasestm.nim b/tests/run/tcasestm.nim
index cb63e0c51..cb63e0c51 100755
--- a/tests/accept/run/tcasestm.nim
+++ b/tests/run/tcasestm.nim
diff --git a/tests/accept/run/tcgbug.nim b/tests/run/tcgbug.nim
index 417b909ae..417b909ae 100755
--- a/tests/accept/run/tcgbug.nim
+++ b/tests/run/tcgbug.nim
diff --git a/tests/accept/run/tclosure.nim b/tests/run/tclosure.nim
index d7c0ec0e3..d7c0ec0e3 100755
--- a/tests/accept/run/tclosure.nim
+++ b/tests/run/tclosure.nim
diff --git a/tests/accept/run/tcnstseq.nim b/tests/run/tcnstseq.nim
index e7d2333b4..e7d2333b4 100755
--- a/tests/accept/run/tcnstseq.nim
+++ b/tests/run/tcnstseq.nim
diff --git a/tests/accept/run/tcnstseq2.nim b/tests/run/tcnstseq2.nim
index 1a27b2ba7..1a27b2ba7 100644
--- a/tests/accept/run/tcnstseq2.nim
+++ b/tests/run/tcnstseq2.nim
diff --git a/tests/accept/run/tcnstseq3.nim b/tests/run/tcnstseq3.nim
index e59516e85..e59516e85 100644
--- a/tests/accept/run/tcnstseq3.nim
+++ b/tests/run/tcnstseq3.nim
diff --git a/tests/accept/run/tconstr2.nim b/tests/run/tconstr2.nim
index 30cec5cb8..30cec5cb8 100755
--- a/tests/accept/run/tconstr2.nim
+++ b/tests/run/tconstr2.nim
diff --git a/tests/accept/run/tcontinuexc.nim b/tests/run/tcontinuexc.nim
index f618abc14..f618abc14 100755
--- a/tests/accept/run/tcontinuexc.nim
+++ b/tests/run/tcontinuexc.nim
diff --git a/tests/accept/run/tcopy.nim b/tests/run/tcopy.nim
index 5feb0d6b3..5feb0d6b3 100755
--- a/tests/accept/run/tcopy.nim
+++ b/tests/run/tcopy.nim
diff --git a/tests/accept/run/tcountup.nim b/tests/run/tcountup.nim
index e68a614b0..e68a614b0 100755
--- a/tests/accept/run/tcountup.nim
+++ b/tests/run/tcountup.nim
diff --git a/tests/accept/run/tcurrncy.nim b/tests/run/tcurrncy.nim
index a614de7af..a614de7af 100755
--- a/tests/accept/run/tcurrncy.nim
+++ b/tests/run/tcurrncy.nim
diff --git a/tests/accept/run/temit.nim b/tests/run/temit.nim
index 460bc3443..460bc3443 100755
--- a/tests/accept/run/temit.nim
+++ b/tests/run/temit.nim
diff --git a/tests/accept/run/tenumhole.nim b/tests/run/tenumhole.nim
index b721c73dd..b721c73dd 100755
--- a/tests/accept/run/tenumhole.nim
+++ b/tests/run/tenumhole.nim
diff --git a/tests/accept/run/teventemitter.nim b/tests/run/teventemitter.nim
index 8394776a8..8394776a8 100644
--- a/tests/accept/run/teventemitter.nim
+++ b/tests/run/teventemitter.nim
diff --git a/tests/accept/run/tevents.nim b/tests/run/tevents.nim
index fb94b1f79..fb94b1f79 100644
--- a/tests/accept/run/tevents.nim
+++ b/tests/run/tevents.nim
diff --git a/tests/accept/run/texcsub.nim b/tests/run/texcsub.nim
index 3dba357f9..3dba357f9 100755
--- a/tests/accept/run/texcsub.nim
+++ b/tests/run/texcsub.nim
diff --git a/tests/accept/run/texplicitgeneric1.nim b/tests/run/texplicitgeneric1.nim
index 6cca71ac0..6cca71ac0 100755
--- a/tests/accept/run/texplicitgeneric1.nim
+++ b/tests/run/texplicitgeneric1.nim
diff --git a/tests/accept/run/texplicitgeneric2.nim b/tests/run/texplicitgeneric2.nim
index 95461d023..95461d023 100755
--- a/tests/accept/run/texplicitgeneric2.nim
+++ b/tests/run/texplicitgeneric2.nim
diff --git a/tests/accept/run/tfielditerator.nim b/tests/run/tfielditerator.nim
index 2919aab41..2919aab41 100755
--- a/tests/accept/run/tfielditerator.nim
+++ b/tests/run/tfielditerator.nim
diff --git a/tests/accept/run/tfinally.nim b/tests/run/tfinally.nim
index 29313c3fd..29313c3fd 100755
--- a/tests/accept/run/tfinally.nim
+++ b/tests/run/tfinally.nim
diff --git a/tests/accept/run/tfinally2.nim b/tests/run/tfinally2.nim
index 3ed212a7c..3ed212a7c 100755
--- a/tests/accept/run/tfinally2.nim
+++ b/tests/run/tfinally2.nim
diff --git a/tests/accept/run/tfinally3.nim b/tests/run/tfinally3.nim
index e65661cd0..e65661cd0 100755
--- a/tests/accept/run/tfinally3.nim
+++ b/tests/run/tfinally3.nim
diff --git a/tests/accept/run/tfloat1.nim b/tests/run/tfloat1.nim
index f290fdb57..f290fdb57 100755
--- a/tests/accept/run/tfloat1.nim
+++ b/tests/run/tfloat1.nim
diff --git a/tests/accept/run/tfloat2.nim b/tests/run/tfloat2.nim
index 51883674f..51883674f 100755
--- a/tests/accept/run/tfloat2.nim
+++ b/tests/run/tfloat2.nim
diff --git a/tests/accept/run/tfloat3.nim b/tests/run/tfloat3.nim
index 4382dd3ed..4382dd3ed 100755
--- a/tests/accept/run/tfloat3.nim
+++ b/tests/run/tfloat3.nim
diff --git a/tests/accept/run/tformat.nim b/tests/run/tformat.nim
index 92c0c16f5..92c0c16f5 100755
--- a/tests/accept/run/tformat.nim
+++ b/tests/run/tformat.nim
diff --git a/tests/accept/run/tfriends.nim b/tests/run/tfriends.nim
index 1e70d50a5..1e70d50a5 100644
--- a/tests/accept/run/tfriends.nim
+++ b/tests/run/tfriends.nim
diff --git a/tests/accept/run/tgenericassign.nim b/tests/run/tgenericassign.nim
index 654b0ab8f..654b0ab8f 100755
--- a/tests/accept/run/tgenericassign.nim
+++ b/tests/run/tgenericassign.nim
diff --git a/tests/accept/run/tgenericassigntuples.nim b/tests/run/tgenericassigntuples.nim
index 6dd63a984..6dd63a984 100755
--- a/tests/accept/run/tgenericassigntuples.nim
+++ b/tests/run/tgenericassigntuples.nim
diff --git a/tests/accept/run/tgenericprocvar.nim b/tests/run/tgenericprocvar.nim
index 7fdc58ca4..7fdc58ca4 100644
--- a/tests/accept/run/tgenericprocvar.nim
+++ b/tests/run/tgenericprocvar.nim
diff --git a/tests/accept/run/tgenerics1.nim b/tests/run/tgenerics1.nim
index 5d20a864b..5d20a864b 100755
--- a/tests/accept/run/tgenerics1.nim
+++ b/tests/run/tgenerics1.nim
diff --git a/tests/accept/run/thintoff.nim b/tests/run/thintoff.nim
index 807ff44f3..807ff44f3 100755
--- a/tests/accept/run/thintoff.nim
+++ b/tests/run/thintoff.nim
diff --git a/tests/accept/run/tidgen.nim b/tests/run/tidgen.nim
index 68fffbabb..68fffbabb 100644
--- a/tests/accept/run/tidgen.nim
+++ b/tests/run/tidgen.nim
diff --git a/tests/accept/run/tinit.nim b/tests/run/tinit.nim
index 5c75567ec..5c75567ec 100755
--- a/tests/accept/run/tinit.nim
+++ b/tests/run/tinit.nim
diff --git a/tests/accept/run/tints.nim b/tests/run/tints.nim
index 6c9897860..6c9897860 100755
--- a/tests/accept/run/tints.nim
+++ b/tests/run/tints.nim
diff --git a/tests/accept/run/tisopr.nim b/tests/run/tisopr.nim
index 6d3c51749..6d3c51749 100644
--- a/tests/accept/run/tisopr.nim
+++ b/tests/run/tisopr.nim
diff --git a/tests/accept/run/titer3.nim b/tests/run/titer3.nim
index ab95dd7bd..ab95dd7bd 100755
--- a/tests/accept/run/titer3.nim
+++ b/tests/run/titer3.nim
diff --git a/tests/accept/run/titer5.nim b/tests/run/titer5.nim
index bbd50fcb1..bbd50fcb1 100755
--- a/tests/accept/run/titer5.nim
+++ b/tests/run/titer5.nim
diff --git a/tests/accept/run/titer6.nim b/tests/run/titer6.nim
index dceace0e0..dceace0e0 100755
--- a/tests/accept/run/titer6.nim
+++ b/tests/run/titer6.nim
diff --git a/tests/accept/run/titervaropenarray.nim b/tests/run/titervaropenarray.nim
index 1e70ce247..1e70ce247 100755
--- a/tests/accept/run/titervaropenarray.nim
+++ b/tests/run/titervaropenarray.nim
diff --git a/tests/accept/run/tkoeniglookup.nim b/tests/run/tkoeniglookup.nim
index e6f5c0112..e6f5c0112 100755
--- a/tests/accept/run/tkoeniglookup.nim
+++ b/tests/run/tkoeniglookup.nim
diff --git a/tests/accept/run/tlenopenarray.nim b/tests/run/tlenopenarray.nim
index 58041def2..58041def2 100755
--- a/tests/accept/run/tlenopenarray.nim
+++ b/tests/run/tlenopenarray.nim
diff --git a/tests/accept/run/tlists.nim b/tests/run/tlists.nim
index 7d5379945..7d5379945 100755
--- a/tests/accept/run/tlists.nim
+++ b/tests/run/tlists.nim
diff --git a/tests/accept/run/tlowhigh.nim b/tests/run/tlowhigh.nim
index d1cbd3272..d1cbd3272 100755
--- a/tests/accept/run/tlowhigh.nim
+++ b/tests/run/tlowhigh.nim
diff --git a/tests/accept/run/tmacro2.nim b/tests/run/tmacro2.nim
index 6aa9bb57d..6aa9bb57d 100755
--- a/tests/accept/run/tmacro2.nim
+++ b/tests/run/tmacro2.nim
diff --git a/tests/accept/run/tmacro3.nim b/tests/run/tmacro3.nim
index fa2040e92..fa2040e92 100755
--- a/tests/accept/run/tmacro3.nim
+++ b/tests/run/tmacro3.nim
diff --git a/tests/accept/run/tmacro4.nim b/tests/run/tmacro4.nim
index f90a8a434..f90a8a434 100755
--- a/tests/accept/run/tmacro4.nim
+++ b/tests/run/tmacro4.nim
diff --git a/tests/accept/run/tmacros1.nim b/tests/run/tmacros1.nim
index 8cf2a5aa7..8cf2a5aa7 100755
--- a/tests/accept/run/tmacros1.nim
+++ b/tests/run/tmacros1.nim
diff --git a/tests/accept/run/tmatrix.nim b/tests/run/tmatrix.nim
index 90dfde959..90dfde959 100755
--- a/tests/accept/run/tmatrix.nim
+++ b/tests/run/tmatrix.nim
diff --git a/tests/accept/run/tmethods1.nim b/tests/run/tmethods1.nim
index adcca9e19..adcca9e19 100755
--- a/tests/accept/run/tmethods1.nim
+++ b/tests/run/tmethods1.nim
diff --git a/tests/accept/run/tmoditer.nim b/tests/run/tmoditer.nim
index 1e6be37e4..1e6be37e4 100644
--- a/tests/accept/run/tmoditer.nim
+++ b/tests/run/tmoditer.nim
diff --git a/tests/accept/run/tmultim1.nim b/tests/run/tmultim1.nim
index 542c846c7..542c846c7 100755
--- a/tests/accept/run/tmultim1.nim
+++ b/tests/run/tmultim1.nim
diff --git a/tests/accept/run/tmultim2.nim b/tests/run/tmultim2.nim
index 956b22647..956b22647 100755
--- a/tests/accept/run/tmultim2.nim
+++ b/tests/run/tmultim2.nim
diff --git a/tests/accept/run/tmultim3.nim b/tests/run/tmultim3.nim
index 373c84c0e..373c84c0e 100755
--- a/tests/accept/run/tmultim3.nim
+++ b/tests/run/tmultim3.nim
diff --git a/tests/accept/run/tmultim4.nim b/tests/run/tmultim4.nim
index 6bb7970dd..6bb7970dd 100755
--- a/tests/accept/run/tmultim4.nim
+++ b/tests/run/tmultim4.nim
diff --git a/tests/accept/run/tnamedenumfields.nim b/tests/run/tnamedenumfields.nim
index e9ac88a42..e9ac88a42 100755
--- a/tests/accept/run/tnamedenumfields.nim
+++ b/tests/run/tnamedenumfields.nim
diff --git a/tests/accept/run/tnestif.nim b/tests/run/tnestif.nim
index bfcd8751c..bfcd8751c 100755
--- a/tests/accept/run/tnestif.nim
+++ b/tests/run/tnestif.nim
diff --git a/tests/accept/run/tnestprc.nim b/tests/run/tnestprc.nim
index c10ad6abf..c10ad6abf 100755
--- a/tests/accept/run/tnestprc.nim
+++ b/tests/run/tnestprc.nim
diff --git a/tests/accept/run/tnewderef.nim b/tests/run/tnewderef.nim
index 89dc4c8d1..89dc4c8d1 100755
--- a/tests/accept/run/tnewderef.nim
+++ b/tests/run/tnewderef.nim
diff --git a/tests/accept/run/tnodeadlocks.nim b/tests/run/tnodeadlocks.nim
index 18fdca3e9..18fdca3e9 100755
--- a/tests/accept/run/tnodeadlocks.nim
+++ b/tests/run/tnodeadlocks.nim
diff --git a/tests/accept/run/tofopr.nim b/tests/run/tofopr.nim
index f9c21ad16..f9c21ad16 100755
--- a/tests/accept/run/tofopr.nim
+++ b/tests/run/tofopr.nim
diff --git a/tests/accept/run/toop1.nim b/tests/run/toop1.nim
index 35af2fcc2..35af2fcc2 100755
--- a/tests/accept/run/toop1.nim
+++ b/tests/run/toop1.nim
diff --git a/tests/accept/run/topenarrayrepr.nim b/tests/run/topenarrayrepr.nim
index ec7be722a..ec7be722a 100755
--- a/tests/accept/run/topenarrayrepr.nim
+++ b/tests/run/topenarrayrepr.nim
diff --git a/tests/accept/run/topenlen.nim b/tests/run/topenlen.nim
index fec8e87b7..fec8e87b7 100755
--- a/tests/accept/run/topenlen.nim
+++ b/tests/run/topenlen.nim
diff --git a/tests/accept/run/toprprec.nim b/tests/run/toprprec.nim
index 17ec91fda..17ec91fda 100755
--- a/tests/accept/run/toprprec.nim
+++ b/tests/run/toprprec.nim
diff --git a/tests/accept/run/toverflw.nim b/tests/run/toverflw.nim
index cd7b65acf..cd7b65acf 100755
--- a/tests/accept/run/toverflw.nim
+++ b/tests/run/toverflw.nim
diff --git a/tests/accept/run/toverflw2.nim b/tests/run/toverflw2.nim
index f7fe3d574..f7fe3d574 100755
--- a/tests/accept/run/toverflw2.nim
+++ b/tests/run/toverflw2.nim
diff --git a/tests/accept/run/toverl2.nim b/tests/run/toverl2.nim
index 49b17da4d..49b17da4d 100755
--- a/tests/accept/run/toverl2.nim
+++ b/tests/run/toverl2.nim
diff --git a/tests/accept/run/toverlop.nim b/tests/run/toverlop.nim
index ce302345f..ce302345f 100755
--- a/tests/accept/run/toverlop.nim
+++ b/tests/run/toverlop.nim
diff --git a/tests/accept/run/toverwr.nim b/tests/run/toverwr.nim
index ef25e8913..ef25e8913 100755
--- a/tests/accept/run/toverwr.nim
+++ b/tests/run/toverwr.nim
diff --git a/tests/accept/run/tovfint.nim b/tests/run/tovfint.nim
index cfb1e649d..cfb1e649d 100755
--- a/tests/accept/run/tovfint.nim
+++ b/tests/run/tovfint.nim
diff --git a/tests/accept/run/tpegs.nim b/tests/run/tpegs.nim
index 64c547b24..64c547b24 100755
--- a/tests/accept/run/tpegs.nim
+++ b/tests/run/tpegs.nim
diff --git a/tests/accept/run/tpos.nim b/tests/run/tpos.nim
index 3d72536dd..3d72536dd 100755
--- a/tests/accept/run/tpos.nim
+++ b/tests/run/tpos.nim
diff --git a/tests/accept/run/tprecedence.nim b/tests/run/tprecedence.nim
index 6b1b250a2..6b1b250a2 100644
--- a/tests/accept/run/tprecedence.nim
+++ b/tests/run/tprecedence.nim
diff --git a/tests/accept/run/tprintf.nim b/tests/run/tprintf.nim
index c8fb51cdc..c8fb51cdc 100755
--- a/tests/accept/run/tprintf.nim
+++ b/tests/run/tprintf.nim
diff --git a/tests/accept/run/tprocvar.nim b/tests/run/tprocvar.nim
index 237e2ef7a..237e2ef7a 100755
--- a/tests/accept/run/tprocvar.nim
+++ b/tests/run/tprocvar.nim
diff --git a/tests/accept/run/tquotewords.nim b/tests/run/tquotewords.nim
index 81f30c9a9..81f30c9a9 100755
--- a/tests/accept/run/tquotewords.nim
+++ b/tests/run/tquotewords.nim
diff --git a/tests/accept/run/tregex.nim b/tests/run/tregex.nim
index 7ac628c4d..7ac628c4d 100755
--- a/tests/accept/run/tregex.nim
+++ b/tests/run/tregex.nim
diff --git a/tests/accept/run/treguse.nim b/tests/run/treguse.nim
index a610ad725..a610ad725 100755
--- a/tests/accept/run/treguse.nim
+++ b/tests/run/treguse.nim
diff --git a/tests/accept/run/trepr.nim b/tests/run/trepr.nim
index 622c9c78a..622c9c78a 100755
--- a/tests/accept/run/trepr.nim
+++ b/tests/run/trepr.nim
diff --git a/tests/accept/run/treraise.nim b/tests/run/treraise.nim
index cbd0b5f8a..cbd0b5f8a 100755
--- a/tests/accept/run/treraise.nim
+++ b/tests/run/treraise.nim
diff --git a/tests/accept/run/tromans.nim b/tests/run/tromans.nim
index fa6a63595..fa6a63595 100755
--- a/tests/accept/run/tromans.nim
+++ b/tests/run/tromans.nim
diff --git a/tests/accept/run/tseqcon.nim b/tests/run/tseqcon.nim
index 6e0a5b56d..6e0a5b56d 100755
--- a/tests/accept/run/tseqcon.nim
+++ b/tests/run/tseqcon.nim
diff --git a/tests/accept/run/tseqtuple.nim b/tests/run/tseqtuple.nim
index 7ef92f7f1..7ef92f7f1 100755
--- a/tests/accept/run/tseqtuple.nim
+++ b/tests/run/tseqtuple.nim
diff --git a/tests/accept/run/tsequtils.nim b/tests/run/tsequtils.nim
index 2982ca612..2982ca612 100644
--- a/tests/accept/run/tsequtils.nim
+++ b/tests/run/tsequtils.nim
diff --git a/tests/accept/run/tsets.nim b/tests/run/tsets.nim
index 7b806f15b..7b806f15b 100755
--- a/tests/accept/run/tsets.nim
+++ b/tests/run/tsets.nim
diff --git a/tests/accept/run/tsets2.nim b/tests/run/tsets2.nim
index 89935072f..89935072f 100755
--- a/tests/accept/run/tsets2.nim
+++ b/tests/run/tsets2.nim
diff --git a/tests/accept/run/tsidee2.nim b/tests/run/tsidee2.nim
index e73c89608..e73c89608 100755
--- a/tests/accept/run/tsidee2.nim
+++ b/tests/run/tsidee2.nim
diff --git a/tests/accept/run/tsidee3.nim b/tests/run/tsidee3.nim
index e0c427ab6..e0c427ab6 100755
--- a/tests/accept/run/tsidee3.nim
+++ b/tests/run/tsidee3.nim
diff --git a/tests/accept/run/tsimmeth.nim b/tests/run/tsimmeth.nim
index 11ff2674f..11ff2674f 100755
--- a/tests/accept/run/tsimmeth.nim
+++ b/tests/run/tsimmeth.nim
diff --git a/tests/accept/run/tsimplesort.nim b/tests/run/tsimplesort.nim
index 0167ca78a..0167ca78a 100755
--- a/tests/accept/run/tsimplesort.nim
+++ b/tests/run/tsimplesort.nim
diff --git a/tests/accept/run/tslices.nim b/tests/run/tslices.nim
index 0de1171e3..0de1171e3 100755
--- a/tests/accept/run/tslices.nim
+++ b/tests/run/tslices.nim
diff --git a/tests/accept/run/tsplit.nim b/tests/run/tsplit.nim
index 25bad33e2..25bad33e2 100755
--- a/tests/accept/run/tsplit.nim
+++ b/tests/run/tsplit.nim
diff --git a/tests/accept/run/tstrange.nim b/tests/run/tstrange.nim
index 3947755fc..3947755fc 100755
--- a/tests/accept/run/tstrange.nim
+++ b/tests/run/tstrange.nim
diff --git a/tests/accept/run/tstringinterp.nim b/tests/run/tstringinterp.nim
index e1a55c94b..e1a55c94b 100644
--- a/tests/accept/run/tstringinterp.nim
+++ b/tests/run/tstringinterp.nim
diff --git a/tests/accept/run/tstrlits.nim b/tests/run/tstrlits.nim
index 1cd43975a..1cd43975a 100755
--- a/tests/accept/run/tstrlits.nim
+++ b/tests/run/tstrlits.nim
diff --git a/tests/accept/run/tstrutil.nim b/tests/run/tstrutil.nim
index 80c2f3870..80c2f3870 100755
--- a/tests/accept/run/tstrutil.nim
+++ b/tests/run/tstrutil.nim
diff --git a/tests/accept/run/ttables.nim b/tests/run/ttables.nim
index b82badccb..b82badccb 100755
--- a/tests/accept/run/ttables.nim
+++ b/tests/run/ttables.nim
diff --git a/tests/accept/run/ttoseq.nim b/tests/run/ttoseq.nim
index d631a91e0..d631a91e0 100755
--- a/tests/accept/run/ttoseq.nim
+++ b/tests/run/ttoseq.nim
diff --git a/tests/accept/run/tunhandledexc.nim b/tests/run/tunhandledexc.nim
index f24881aef..f24881aef 100755
--- a/tests/accept/run/tunhandledexc.nim
+++ b/tests/run/tunhandledexc.nim
diff --git a/tests/accept/run/tunidecode.nim b/tests/run/tunidecode.nim
index 4c074b391..4c074b391 100644
--- a/tests/accept/run/tunidecode.nim
+++ b/tests/run/tunidecode.nim
diff --git a/tests/accept/run/tusingstatement.nim b/tests/run/tusingstatement.nim
index 0017af556..0017af556 100644
--- a/tests/accept/run/tusingstatement.nim
+++ b/tests/run/tusingstatement.nim
diff --git a/tests/accept/run/tvardecl.nim b/tests/run/tvardecl.nim
index 5cc6f4960..5cc6f4960 100755
--- a/tests/accept/run/tvardecl.nim
+++ b/tests/run/tvardecl.nim
diff --git a/tests/accept/run/tvariantasgn.nim b/tests/run/tvariantasgn.nim
index 46cc23dd1..46cc23dd1 100755
--- a/tests/accept/run/tvariantasgn.nim
+++ b/tests/run/tvariantasgn.nim
diff --git a/tests/accept/run/tvariantstack.nim b/tests/run/tvariantstack.nim
index d81f6e001..d81f6e001 100755
--- a/tests/accept/run/tvariantstack.nim
+++ b/tests/run/tvariantstack.nim
diff --git a/tests/accept/run/tvarnums.nim b/tests/run/tvarnums.nim
index 4f99df8b9..4f99df8b9 100755
--- a/tests/accept/run/tvarnums.nim
+++ b/tests/run/tvarnums.nim
diff --git a/tests/accept/run/tvarres1.nim b/tests/run/tvarres1.nim
index a48c961df..a48c961df 100644
--- a/tests/accept/run/tvarres1.nim
+++ b/tests/run/tvarres1.nim
diff --git a/tests/accept/run/tvarres2.nim b/tests/run/tvarres2.nim
index 119560e7b..119560e7b 100644
--- a/tests/accept/run/tvarres2.nim
+++ b/tests/run/tvarres2.nim
diff --git a/tests/accept/run/tvartup.nim b/tests/run/tvartup.nim
index f885cdf37..f885cdf37 100755
--- a/tests/accept/run/tvartup.nim
+++ b/tests/run/tvartup.nim
diff --git a/tests/accept/run/twrongexc.nim b/tests/run/twrongexc.nim
index 755f7d979..755f7d979 100755
--- a/tests/accept/run/twrongexc.nim
+++ b/tests/run/twrongexc.nim
diff --git a/tests/accept/run/txmlgen.nim b/tests/run/txmlgen.nim
index 917427abc..917427abc 100755
--- a/tests/accept/run/txmlgen.nim
+++ b/tests/run/txmlgen.nim
diff --git a/tests/accept/run/txmltree.nim b/tests/run/txmltree.nim
index 931871f15..931871f15 100755
--- a/tests/accept/run/txmltree.nim
+++ b/tests/run/txmltree.nim
diff --git a/tests/tester.nim b/tests/tester.nim
index 9f59e7da3..5f70b8f5b 100755
--- a/tests/tester.nim
+++ b/tests/tester.nim
@@ -335,7 +335,7 @@ proc main() =
     writeResults(rejectJson, rejectRes)
   of "compile":
     var compileRes = initResults()
-    compile(compileRes, "tests/accept/compile/t*.nim", p.cmdLineRest.string)
+    compile(compileRes, "tests/compile/t*.nim", p.cmdLineRest.string)
     compile(compileRes, "tests/ecmas.nim", p.cmdLineRest.string)
     compileSpecialTests(compileRes, p.cmdLineRest.string)
     writeResults(compileJson, compileRes)
@@ -347,7 +347,7 @@ proc main() =
     writeResults(compileJson, compileRes)
   of "run":
     var runRes = initResults()
-    run(runRes, "tests/accept/run", p.cmdLineRest.string)
+    run(runRes, "tests/run", p.cmdLineRest.string)
     runSpecialTests(runRes, p.cmdLineRest.string)
     writeResults(runJson, runRes)
   of "merge":