diff --git a/examples/httpserver2.nim b/examples/httpserver2.nim
index 56bd630ad1..45c57a7556 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
similarity index 100%
rename from tests/accept/compile/mrecmod.nim
rename to tests/compile/mrecmod.nim
diff --git a/tests/accept/compile/mrecmod2.nim b/tests/compile/mrecmod2.nim
similarity index 100%
rename from tests/accept/compile/mrecmod2.nim
rename to tests/compile/mrecmod2.nim
diff --git a/tests/accept/compile/mtempl5.nim b/tests/compile/mtempl5.nim
similarity index 100%
rename from tests/accept/compile/mtempl5.nim
rename to tests/compile/mtempl5.nim
diff --git a/tests/accept/compile/mvarious.nim b/tests/compile/mvarious.nim
similarity index 100%
rename from tests/accept/compile/mvarious.nim
rename to tests/compile/mvarious.nim
diff --git a/tests/accept/compile/sunset.tmpl b/tests/compile/sunset.tmpl
similarity index 100%
rename from tests/accept/compile/sunset.tmpl
rename to tests/compile/sunset.tmpl
diff --git a/tests/accept/compile/tambsym2.nim b/tests/compile/tambsym2.nim
similarity index 100%
rename from tests/accept/compile/tambsym2.nim
rename to tests/compile/tambsym2.nim
diff --git a/tests/accept/compile/tarrindx.nim b/tests/compile/tarrindx.nim
similarity index 100%
rename from tests/accept/compile/tarrindx.nim
rename to tests/compile/tarrindx.nim
diff --git a/tests/accept/compile/tassign.nim b/tests/compile/tassign.nim
similarity index 100%
rename from tests/accept/compile/tassign.nim
rename to tests/compile/tassign.nim
diff --git a/tests/accept/compile/tcan_alias_generic.nim b/tests/compile/tcan_alias_generic.nim
similarity index 100%
rename from tests/accept/compile/tcan_alias_generic.nim
rename to 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
similarity index 100%
rename from tests/accept/compile/tcan_alias_specialised_generic.nim
rename to tests/compile/tcan_alias_specialised_generic.nim
diff --git a/tests/accept/compile/tcan_inherit_generic.nim b/tests/compile/tcan_inherit_generic.nim
similarity index 100%
rename from tests/accept/compile/tcan_inherit_generic.nim
rename to tests/compile/tcan_inherit_generic.nim
diff --git a/tests/accept/compile/tcan_specialise_generic.nim b/tests/compile/tcan_specialise_generic.nim
similarity index 100%
rename from tests/accept/compile/tcan_specialise_generic.nim
rename to tests/compile/tcan_specialise_generic.nim
diff --git a/tests/accept/compile/tccgen1.nim b/tests/compile/tccgen1.nim
similarity index 100%
rename from tests/accept/compile/tccgen1.nim
rename to tests/compile/tccgen1.nim
diff --git a/tests/accept/compile/tcmdline.nim b/tests/compile/tcmdline.nim
similarity index 100%
rename from tests/accept/compile/tcmdline.nim
rename to tests/compile/tcmdline.nim
diff --git a/tests/accept/compile/tcodegenbug1.nim b/tests/compile/tcodegenbug1.nim
similarity index 100%
rename from tests/accept/compile/tcodegenbug1.nim
rename to tests/compile/tcodegenbug1.nim
diff --git a/tests/accept/compile/tcolors.nim b/tests/compile/tcolors.nim
similarity index 100%
rename from tests/accept/compile/tcolors.nim
rename to tests/compile/tcolors.nim
diff --git a/tests/accept/compile/tconsteval.nim b/tests/compile/tconsteval.nim
similarity index 100%
rename from tests/accept/compile/tconsteval.nim
rename to tests/compile/tconsteval.nim
diff --git a/tests/accept/compile/tconstraints.nim b/tests/compile/tconstraints.nim
similarity index 100%
rename from tests/accept/compile/tconstraints.nim
rename to tests/compile/tconstraints.nim
diff --git a/tests/accept/compile/tconvcolors.nim b/tests/compile/tconvcolors.nim
similarity index 100%
rename from tests/accept/compile/tconvcolors.nim
rename to tests/compile/tconvcolors.nim
diff --git a/tests/accept/compile/tconvert.nim b/tests/compile/tconvert.nim
similarity index 100%
rename from tests/accept/compile/tconvert.nim
rename to tests/compile/tconvert.nim
diff --git a/tests/accept/compile/tcputime.nim b/tests/compile/tcputime.nim
similarity index 100%
rename from tests/accept/compile/tcputime.nim
rename to tests/compile/tcputime.nim
diff --git a/tests/accept/compile/tdialogs.nim b/tests/compile/tdialogs.nim
similarity index 100%
rename from tests/accept/compile/tdialogs.nim
rename to tests/compile/tdialogs.nim
diff --git a/tests/accept/compile/tdictdestruct.nim b/tests/compile/tdictdestruct.nim
similarity index 100%
rename from tests/accept/compile/tdictdestruct.nim
rename to tests/compile/tdictdestruct.nim
diff --git a/tests/accept/compile/tdiscardable.nim b/tests/compile/tdiscardable.nim
similarity index 100%
rename from tests/accept/compile/tdiscardable.nim
rename to tests/compile/tdiscardable.nim
diff --git a/tests/accept/compile/tdllvar.nim b/tests/compile/tdllvar.nim
similarity index 100%
rename from tests/accept/compile/tdllvar.nim
rename to tests/compile/tdllvar.nim
diff --git a/tests/accept/compile/tdumpast.nim b/tests/compile/tdumpast.nim
similarity index 100%
rename from tests/accept/compile/tdumpast.nim
rename to tests/compile/tdumpast.nim
diff --git a/tests/accept/compile/tdumpast2.nim b/tests/compile/tdumpast2.nim
similarity index 100%
rename from tests/accept/compile/tdumpast2.nim
rename to tests/compile/tdumpast2.nim
diff --git a/tests/accept/compile/techo.nim b/tests/compile/techo.nim
similarity index 100%
rename from tests/accept/compile/techo.nim
rename to tests/compile/techo.nim
diff --git a/tests/accept/compile/temptyecho.nim b/tests/compile/temptyecho.nim
similarity index 100%
rename from tests/accept/compile/temptyecho.nim
rename to tests/compile/temptyecho.nim
diff --git a/tests/accept/compile/tendian.nim b/tests/compile/tendian.nim
similarity index 100%
rename from tests/accept/compile/tendian.nim
rename to tests/compile/tendian.nim
diff --git a/tests/accept/compile/tenum.nim b/tests/compile/tenum.nim
similarity index 100%
rename from tests/accept/compile/tenum.nim
rename to tests/compile/tenum.nim
diff --git a/tests/accept/compile/tenum2.nim b/tests/compile/tenum2.nim
similarity index 100%
rename from tests/accept/compile/tenum2.nim
rename to tests/compile/tenum2.nim
diff --git a/tests/accept/compile/tenum3.nim b/tests/compile/tenum3.nim
similarity index 100%
rename from tests/accept/compile/tenum3.nim
rename to tests/compile/tenum3.nim
diff --git a/tests/accept/compile/teval1.nim b/tests/compile/teval1.nim
similarity index 100%
rename from tests/accept/compile/teval1.nim
rename to tests/compile/teval1.nim
diff --git a/tests/accept/compile/tfib.nim b/tests/compile/tfib.nim
similarity index 100%
rename from tests/accept/compile/tfib.nim
rename to tests/compile/tfib.nim
diff --git a/tests/accept/compile/tforwardgeneric.nim b/tests/compile/tforwardgeneric.nim
similarity index 100%
rename from tests/accept/compile/tforwardgeneric.nim
rename to tests/compile/tforwardgeneric.nim
diff --git a/tests/accept/compile/tforwty.nim b/tests/compile/tforwty.nim
similarity index 100%
rename from tests/accept/compile/tforwty.nim
rename to tests/compile/tforwty.nim
diff --git a/tests/accept/compile/tforwty2.nim b/tests/compile/tforwty2.nim
similarity index 100%
rename from tests/accept/compile/tforwty2.nim
rename to tests/compile/tforwty2.nim
diff --git a/tests/accept/compile/tgenericmatcher.nim b/tests/compile/tgenericmatcher.nim
similarity index 100%
rename from tests/accept/compile/tgenericmatcher.nim
rename to tests/compile/tgenericmatcher.nim
diff --git a/tests/accept/compile/tgenericmatcher2.nim b/tests/compile/tgenericmatcher2.nim
similarity index 100%
rename from tests/accept/compile/tgenericmatcher2.nim
rename to tests/compile/tgenericmatcher2.nim
diff --git a/tests/accept/compile/tgenericprocvar.nim b/tests/compile/tgenericprocvar.nim
similarity index 100%
rename from tests/accept/compile/tgenericprocvar.nim
rename to tests/compile/tgenericprocvar.nim
diff --git a/tests/accept/compile/tgenericrefs.nim b/tests/compile/tgenericrefs.nim
similarity index 100%
rename from tests/accept/compile/tgenericrefs.nim
rename to tests/compile/tgenericrefs.nim
diff --git a/tests/accept/compile/tgenericvariant.nim b/tests/compile/tgenericvariant.nim
similarity index 100%
rename from tests/accept/compile/tgenericvariant.nim
rename to tests/compile/tgenericvariant.nim
diff --git a/tests/accept/compile/tgetstartmilsecs.nim b/tests/compile/tgetstartmilsecs.nim
similarity index 100%
rename from tests/accept/compile/tgetstartmilsecs.nim
rename to tests/compile/tgetstartmilsecs.nim
diff --git a/tests/accept/compile/tgtk.nim b/tests/compile/tgtk.nim
similarity index 100%
rename from tests/accept/compile/tgtk.nim
rename to tests/compile/tgtk.nim
diff --git a/tests/accept/compile/thallo.nim b/tests/compile/thallo.nim
similarity index 100%
rename from tests/accept/compile/thallo.nim
rename to tests/compile/thallo.nim
diff --git a/tests/accept/compile/thexrange.nim b/tests/compile/thexrange.nim
similarity index 100%
rename from tests/accept/compile/thexrange.nim
rename to tests/compile/thexrange.nim
diff --git a/tests/accept/compile/tident.nim b/tests/compile/tident.nim
similarity index 100%
rename from tests/accept/compile/tident.nim
rename to tests/compile/tident.nim
diff --git a/tests/accept/compile/tindent1.nim b/tests/compile/tindent1.nim
similarity index 100%
rename from tests/accept/compile/tindent1.nim
rename to tests/compile/tindent1.nim
diff --git a/tests/accept/compile/tio.nim b/tests/compile/tio.nim
similarity index 100%
rename from tests/accept/compile/tio.nim
rename to tests/compile/tio.nim
diff --git a/tests/accept/compile/titer.nim b/tests/compile/titer.nim
similarity index 100%
rename from tests/accept/compile/titer.nim
rename to tests/compile/titer.nim
diff --git a/tests/accept/compile/titer2.nim b/tests/compile/titer2.nim
similarity index 100%
rename from tests/accept/compile/titer2.nim
rename to tests/compile/titer2.nim
diff --git a/tests/accept/compile/titer_no_tuple_unpack.nim b/tests/compile/titer_no_tuple_unpack.nim
similarity index 100%
rename from tests/accept/compile/titer_no_tuple_unpack.nim
rename to tests/compile/titer_no_tuple_unpack.nim
diff --git a/tests/accept/compile/tlastmod.nim b/tests/compile/tlastmod.nim
similarity index 100%
rename from tests/accept/compile/tlastmod.nim
rename to tests/compile/tlastmod.nim
diff --git a/tests/accept/compile/tlexer.nim b/tests/compile/tlexer.nim
similarity index 100%
rename from tests/accept/compile/tlexer.nim
rename to tests/compile/tlexer.nim
diff --git a/tests/accept/compile/tlibs.nim b/tests/compile/tlibs.nim
similarity index 100%
rename from tests/accept/compile/tlibs.nim
rename to tests/compile/tlibs.nim
diff --git a/tests/accept/compile/tlinearscanend.nim b/tests/compile/tlinearscanend.nim
similarity index 100%
rename from tests/accept/compile/tlinearscanend.nim
rename to tests/compile/tlinearscanend.nim
diff --git a/tests/accept/compile/tloops.nim b/tests/compile/tloops.nim
similarity index 100%
rename from tests/accept/compile/tloops.nim
rename to tests/compile/tloops.nim
diff --git a/tests/accept/compile/tmacro1.nim b/tests/compile/tmacro1.nim
similarity index 100%
rename from tests/accept/compile/tmacro1.nim
rename to tests/compile/tmacro1.nim
diff --git a/tests/accept/compile/tmacrostmt.nim b/tests/compile/tmacrostmt.nim
similarity index 100%
rename from tests/accept/compile/tmacrostmt.nim
rename to tests/compile/tmacrostmt.nim
diff --git a/tests/accept/compile/tmandelbrot.nim b/tests/compile/tmandelbrot.nim
similarity index 100%
rename from tests/accept/compile/tmandelbrot.nim
rename to tests/compile/tmandelbrot.nim
diff --git a/tests/accept/compile/tmarshal.nim b/tests/compile/tmarshal.nim
similarity index 100%
rename from tests/accept/compile/tmarshal.nim
rename to tests/compile/tmarshal.nim
diff --git a/tests/accept/compile/tmath.nim b/tests/compile/tmath.nim
similarity index 100%
rename from tests/accept/compile/tmath.nim
rename to tests/compile/tmath.nim
diff --git a/tests/accept/compile/tmodulealias.nim b/tests/compile/tmodulealias.nim
similarity index 100%
rename from tests/accept/compile/tmodulealias.nim
rename to tests/compile/tmodulealias.nim
diff --git a/tests/accept/compile/tnamedparams.nim b/tests/compile/tnamedparams.nim
similarity index 100%
rename from tests/accept/compile/tnamedparams.nim
rename to tests/compile/tnamedparams.nim
diff --git a/tests/accept/compile/tnestedproc.nim b/tests/compile/tnestedproc.nim
similarity index 100%
rename from tests/accept/compile/tnestedproc.nim
rename to tests/compile/tnestedproc.nim
diff --git a/tests/accept/compile/tnew.nim b/tests/compile/tnew.nim
similarity index 100%
rename from tests/accept/compile/tnew.nim
rename to tests/compile/tnew.nim
diff --git a/tests/accept/compile/tnewlibs.nim b/tests/compile/tnewlibs.nim
similarity index 100%
rename from tests/accept/compile/tnewlibs.nim
rename to tests/compile/tnewlibs.nim
diff --git a/tests/accept/compile/tnewsets.nim b/tests/compile/tnewsets.nim
similarity index 100%
rename from tests/accept/compile/tnewsets.nim
rename to tests/compile/tnewsets.nim
diff --git a/tests/accept/compile/tnewuns.nim b/tests/compile/tnewuns.nim
similarity index 100%
rename from tests/accept/compile/tnewuns.nim
rename to tests/compile/tnewuns.nim
diff --git a/tests/accept/compile/tnimrodnode_for_runtime.nim b/tests/compile/tnimrodnode_for_runtime.nim
similarity index 100%
rename from tests/accept/compile/tnimrodnode_for_runtime.nim
rename to tests/compile/tnimrodnode_for_runtime.nim
diff --git a/tests/accept/compile/tnoargopenarray.nim b/tests/compile/tnoargopenarray.nim
similarity index 100%
rename from tests/accept/compile/tnoargopenarray.nim
rename to tests/compile/tnoargopenarray.nim
diff --git a/tests/accept/compile/tobjcov.nim b/tests/compile/tobjcov.nim
similarity index 100%
rename from tests/accept/compile/tobjcov.nim
rename to tests/compile/tobjcov.nim
diff --git a/tests/accept/compile/tobject2.nim b/tests/compile/tobject2.nim
similarity index 100%
rename from tests/accept/compile/tobject2.nim
rename to tests/compile/tobject2.nim
diff --git a/tests/accept/compile/tobjects.nim b/tests/compile/tobjects.nim
similarity index 100%
rename from tests/accept/compile/tobjects.nim
rename to tests/compile/tobjects.nim
diff --git a/tests/accept/compile/toop.nim b/tests/compile/toop.nim
similarity index 100%
rename from tests/accept/compile/toop.nim
rename to tests/compile/toop.nim
diff --git a/tests/accept/compile/toptions.nim b/tests/compile/toptions.nim
similarity index 100%
rename from tests/accept/compile/toptions.nim
rename to tests/compile/toptions.nim
diff --git a/tests/accept/compile/tos.nim b/tests/compile/tos.nim
similarity index 100%
rename from tests/accept/compile/tos.nim
rename to tests/compile/tos.nim
diff --git a/tests/accept/compile/toverprc.nim b/tests/compile/toverprc.nim
similarity index 100%
rename from tests/accept/compile/toverprc.nim
rename to tests/compile/toverprc.nim
diff --git a/tests/accept/compile/tparedef.nim b/tests/compile/tparedef.nim
similarity index 100%
rename from tests/accept/compile/tparedef.nim
rename to tests/compile/tparedef.nim
diff --git a/tests/accept/compile/tparscfg.nim b/tests/compile/tparscfg.nim
similarity index 100%
rename from tests/accept/compile/tparscfg.nim
rename to tests/compile/tparscfg.nim
diff --git a/tests/accept/compile/tparsefloat.nim b/tests/compile/tparsefloat.nim
similarity index 100%
rename from tests/accept/compile/tparsefloat.nim
rename to tests/compile/tparsefloat.nim
diff --git a/tests/accept/compile/tparsopt.nim b/tests/compile/tparsopt.nim
similarity index 100%
rename from tests/accept/compile/tparsopt.nim
rename to tests/compile/tparsopt.nim
diff --git a/tests/accept/compile/tposix.nim b/tests/compile/tposix.nim
similarity index 100%
rename from tests/accept/compile/tposix.nim
rename to tests/compile/tposix.nim
diff --git a/tests/accept/compile/tprep.nim b/tests/compile/tprep.nim
similarity index 100%
rename from tests/accept/compile/tprep.nim
rename to tests/compile/tprep.nim
diff --git a/tests/accept/compile/tpush.nim b/tests/compile/tpush.nim
similarity index 100%
rename from tests/accept/compile/tpush.nim
rename to tests/compile/tpush.nim
diff --git a/tests/accept/compile/tquicksort.nim b/tests/compile/tquicksort.nim
similarity index 100%
rename from tests/accept/compile/tquicksort.nim
rename to tests/compile/tquicksort.nim
diff --git a/tests/accept/compile/tquit.nim b/tests/compile/tquit.nim
similarity index 100%
rename from tests/accept/compile/tquit.nim
rename to tests/compile/tquit.nim
diff --git a/tests/accept/compile/tradix.nim b/tests/compile/tradix.nim
similarity index 100%
rename from tests/accept/compile/tradix.nim
rename to tests/compile/tradix.nim
diff --git a/tests/accept/compile/treadln.nim b/tests/compile/treadln.nim
similarity index 100%
rename from tests/accept/compile/treadln.nim
rename to tests/compile/treadln.nim
diff --git a/tests/accept/compile/treadx.nim b/tests/compile/treadx.nim
similarity index 100%
rename from tests/accept/compile/treadx.nim
rename to tests/compile/treadx.nim
diff --git a/tests/accept/compile/trecmod.nim b/tests/compile/trecmod.nim
similarity index 100%
rename from tests/accept/compile/trecmod.nim
rename to tests/compile/trecmod.nim
diff --git a/tests/accept/compile/trecmod2.nim b/tests/compile/trecmod2.nim
similarity index 100%
rename from tests/accept/compile/trecmod2.nim
rename to tests/compile/trecmod2.nim
diff --git a/tests/accept/compile/trectuple.nim b/tests/compile/trectuple.nim
similarity index 100%
rename from tests/accept/compile/trectuple.nim
rename to tests/compile/trectuple.nim
diff --git a/tests/accept/compile/trectuples.nim b/tests/compile/trectuples.nim
similarity index 100%
rename from tests/accept/compile/trectuples.nim
rename to tests/compile/trectuples.nim
diff --git a/tests/accept/compile/trepr.nim b/tests/compile/trepr.nim
similarity index 100%
rename from tests/accept/compile/trepr.nim
rename to tests/compile/trepr.nim
diff --git a/tests/accept/compile/tseq2.nim b/tests/compile/tseq2.nim
similarity index 100%
rename from tests/accept/compile/tseq2.nim
rename to tests/compile/tseq2.nim
diff --git a/tests/accept/compile/tseqcon2.nim b/tests/compile/tseqcon2.nim
similarity index 100%
rename from tests/accept/compile/tseqcon2.nim
rename to tests/compile/tseqcon2.nim
diff --git a/tests/accept/compile/tshadow_magic_type.nim b/tests/compile/tshadow_magic_type.nim
similarity index 100%
rename from tests/accept/compile/tshadow_magic_type.nim
rename to tests/compile/tshadow_magic_type.nim
diff --git a/tests/accept/compile/tsizeof.nim b/tests/compile/tsizeof.nim
similarity index 100%
rename from tests/accept/compile/tsizeof.nim
rename to tests/compile/tsizeof.nim
diff --git a/tests/accept/compile/tslurp.nim b/tests/compile/tslurp.nim
similarity index 100%
rename from tests/accept/compile/tslurp.nim
rename to tests/compile/tslurp.nim
diff --git a/tests/accept/compile/tsockets.nim b/tests/compile/tsockets.nim
similarity index 100%
rename from tests/accept/compile/tsockets.nim
rename to tests/compile/tsockets.nim
diff --git a/tests/accept/compile/tsortdev.nim b/tests/compile/tsortdev.nim
similarity index 100%
rename from tests/accept/compile/tsortdev.nim
rename to tests/compile/tsortdev.nim
diff --git a/tests/accept/compile/tspecialised_is_equivalent.nim b/tests/compile/tspecialised_is_equivalent.nim
similarity index 100%
rename from tests/accept/compile/tspecialised_is_equivalent.nim
rename to tests/compile/tspecialised_is_equivalent.nim
diff --git a/tests/accept/compile/tstrace.nim b/tests/compile/tstrace.nim
similarity index 100%
rename from tests/accept/compile/tstrace.nim
rename to tests/compile/tstrace.nim
diff --git a/tests/accept/compile/tstrdesc.nim b/tests/compile/tstrdesc.nim
similarity index 100%
rename from tests/accept/compile/tstrdesc.nim
rename to tests/compile/tstrdesc.nim
diff --git a/tests/accept/compile/tstrdist.nim b/tests/compile/tstrdist.nim
similarity index 100%
rename from tests/accept/compile/tstrdist.nim
rename to tests/compile/tstrdist.nim
diff --git a/tests/accept/compile/tstreams.nim b/tests/compile/tstreams.nim
similarity index 100%
rename from tests/accept/compile/tstreams.nim
rename to tests/compile/tstreams.nim
diff --git a/tests/accept/compile/tstrset.nim b/tests/compile/tstrset.nim
similarity index 100%
rename from tests/accept/compile/tstrset.nim
rename to tests/compile/tstrset.nim
diff --git a/tests/accept/compile/tstrtabs.nim b/tests/compile/tstrtabs.nim
similarity index 100%
rename from tests/accept/compile/tstrtabs.nim
rename to tests/compile/tstrtabs.nim
diff --git a/tests/accept/compile/ttableconstr.nim b/tests/compile/ttableconstr.nim
similarity index 100%
rename from tests/accept/compile/ttableconstr.nim
rename to tests/compile/ttableconstr.nim
diff --git a/tests/accept/compile/ttempl.nim b/tests/compile/ttempl.nim
similarity index 100%
rename from tests/accept/compile/ttempl.nim
rename to tests/compile/ttempl.nim
diff --git a/tests/accept/compile/ttempl3.nim b/tests/compile/ttempl3.nim
similarity index 100%
rename from tests/accept/compile/ttempl3.nim
rename to tests/compile/ttempl3.nim
diff --git a/tests/accept/compile/ttempl4.nim b/tests/compile/ttempl4.nim
similarity index 100%
rename from tests/accept/compile/ttempl4.nim
rename to tests/compile/ttempl4.nim
diff --git a/tests/accept/compile/ttempl5.nim b/tests/compile/ttempl5.nim
similarity index 100%
rename from tests/accept/compile/ttempl5.nim
rename to tests/compile/ttempl5.nim
diff --git a/tests/accept/compile/ttemplreturntype.nim b/tests/compile/ttemplreturntype.nim
similarity index 100%
rename from tests/accept/compile/ttemplreturntype.nim
rename to tests/compile/ttemplreturntype.nim
diff --git a/tests/accept/compile/tthread_generic.nim b/tests/compile/tthread_generic.nim
similarity index 100%
rename from tests/accept/compile/tthread_generic.nim
rename to tests/compile/tthread_generic.nim
diff --git a/tests/accept/compile/ttime.nim b/tests/compile/ttime.nim
similarity index 100%
rename from tests/accept/compile/ttime.nim
rename to tests/compile/ttime.nim
diff --git a/tests/accept/compile/ttuple1.nim b/tests/compile/ttuple1.nim
similarity index 100%
rename from tests/accept/compile/ttuple1.nim
rename to tests/compile/ttuple1.nim
diff --git a/tests/accept/compile/ttypeconverter1.nim b/tests/compile/ttypeconverter1.nim
similarity index 100%
rename from tests/accept/compile/ttypeconverter1.nim
rename to tests/compile/ttypeconverter1.nim
diff --git a/tests/accept/compile/ttypeselectors.nim b/tests/compile/ttypeselectors.nim
similarity index 100%
rename from tests/accept/compile/ttypeselectors.nim
rename to tests/compile/ttypeselectors.nim
diff --git a/tests/accept/compile/tuserpragma.nim b/tests/compile/tuserpragma.nim
similarity index 100%
rename from tests/accept/compile/tuserpragma.nim
rename to tests/compile/tuserpragma.nim
diff --git a/tests/accept/compile/tvarious.nim b/tests/compile/tvarious.nim
similarity index 100%
rename from tests/accept/compile/tvarious.nim
rename to tests/compile/tvarious.nim
diff --git a/tests/accept/compile/tvoid.nim b/tests/compile/tvoid.nim
similarity index 100%
rename from tests/accept/compile/tvoid.nim
rename to tests/compile/tvoid.nim
diff --git a/tests/accept/compile/twalker.nim b/tests/compile/twalker.nim
similarity index 100%
rename from tests/accept/compile/twalker.nim
rename to tests/compile/twalker.nim
diff --git a/tests/accept/compile/typalias.nim b/tests/compile/typalias.nim
similarity index 100%
rename from tests/accept/compile/typalias.nim
rename to tests/compile/typalias.nim
diff --git a/tests/gc/gcbench.nim b/tests/gc/gcbench.nim
index 66164a9e9c..253b748055 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
similarity index 100%
rename from tests/accept/run/mambsys1.nim
rename to tests/run/mambsys1.nim
diff --git a/tests/accept/run/mambsys2.nim b/tests/run/mambsys2.nim
similarity index 100%
rename from tests/accept/run/mambsys2.nim
rename to tests/run/mambsys2.nim
diff --git a/tests/accept/run/mbind3.nim b/tests/run/mbind3.nim
similarity index 100%
rename from tests/accept/run/mbind3.nim
rename to tests/run/mbind3.nim
diff --git a/tests/accept/run/mfriends.nim b/tests/run/mfriends.nim
similarity index 100%
rename from tests/accept/run/mfriends.nim
rename to tests/run/mfriends.nim
diff --git a/tests/accept/run/minit.nim b/tests/run/minit.nim
similarity index 100%
rename from tests/accept/run/minit.nim
rename to tests/run/minit.nim
diff --git a/tests/accept/run/mmultim3.nim b/tests/run/mmultim3.nim
similarity index 100%
rename from tests/accept/run/mmultim3.nim
rename to tests/run/mmultim3.nim
diff --git a/tests/accept/run/tack.nim b/tests/run/tack.nim
similarity index 100%
rename from tests/accept/run/tack.nim
rename to tests/run/tack.nim
diff --git a/tests/accept/run/tactiontable.nim b/tests/run/tactiontable.nim
similarity index 100%
rename from tests/accept/run/tactiontable.nim
rename to tests/run/tactiontable.nim
diff --git a/tests/accept/run/tambsym2.nim b/tests/run/tambsym2.nim
similarity index 100%
rename from tests/accept/run/tambsym2.nim
rename to tests/run/tambsym2.nim
diff --git a/tests/accept/run/tambsys.nim b/tests/run/tambsys.nim
similarity index 100%
rename from tests/accept/run/tambsys.nim
rename to tests/run/tambsys.nim
diff --git a/tests/accept/run/tanontuples.nim b/tests/run/tanontuples.nim
similarity index 100%
rename from tests/accept/run/tanontuples.nim
rename to tests/run/tanontuples.nim
diff --git a/tests/accept/run/tarray.nim b/tests/run/tarray.nim
similarity index 100%
rename from tests/accept/run/tarray.nim
rename to tests/run/tarray.nim
diff --git a/tests/accept/run/tarray2.nim b/tests/run/tarray2.nim
similarity index 100%
rename from tests/accept/run/tarray2.nim
rename to tests/run/tarray2.nim
diff --git a/tests/accept/run/tarray3.nim b/tests/run/tarray3.nim
similarity index 100%
rename from tests/accept/run/tarray3.nim
rename to tests/run/tarray3.nim
diff --git a/tests/accept/run/tarraycons.nim b/tests/run/tarraycons.nim
similarity index 100%
rename from tests/accept/run/tarraycons.nim
rename to tests/run/tarraycons.nim
diff --git a/tests/accept/run/tassert.nim b/tests/run/tassert.nim
similarity index 100%
rename from tests/accept/run/tassert.nim
rename to tests/run/tassert.nim
diff --git a/tests/accept/run/tbind1.nim b/tests/run/tbind1.nim
similarity index 100%
rename from tests/accept/run/tbind1.nim
rename to tests/run/tbind1.nim
diff --git a/tests/accept/run/tbind3.nim b/tests/run/tbind3.nim
similarity index 100%
rename from tests/accept/run/tbind3.nim
rename to tests/run/tbind3.nim
diff --git a/tests/accept/run/tbintre2.nim b/tests/run/tbintre2.nim
similarity index 100%
rename from tests/accept/run/tbintre2.nim
rename to tests/run/tbintre2.nim
diff --git a/tests/accept/run/tbintree.nim b/tests/run/tbintree.nim
similarity index 100%
rename from tests/accept/run/tbintree.nim
rename to tests/run/tbintree.nim
diff --git a/tests/accept/run/tbug499771.nim b/tests/run/tbug499771.nim
similarity index 100%
rename from tests/accept/run/tbug499771.nim
rename to tests/run/tbug499771.nim
diff --git a/tests/accept/run/tbug511622.nim b/tests/run/tbug511622.nim
similarity index 100%
rename from tests/accept/run/tbug511622.nim
rename to tests/run/tbug511622.nim
diff --git a/tests/accept/run/tcase_setconstr.nim b/tests/run/tcase_setconstr.nim
similarity index 100%
rename from tests/accept/run/tcase_setconstr.nim
rename to tests/run/tcase_setconstr.nim
diff --git a/tests/accept/run/tcasestm.nim b/tests/run/tcasestm.nim
similarity index 100%
rename from tests/accept/run/tcasestm.nim
rename to tests/run/tcasestm.nim
diff --git a/tests/accept/run/tcgbug.nim b/tests/run/tcgbug.nim
similarity index 100%
rename from tests/accept/run/tcgbug.nim
rename to tests/run/tcgbug.nim
diff --git a/tests/accept/run/tclosure.nim b/tests/run/tclosure.nim
similarity index 100%
rename from tests/accept/run/tclosure.nim
rename to tests/run/tclosure.nim
diff --git a/tests/accept/run/tcnstseq.nim b/tests/run/tcnstseq.nim
similarity index 100%
rename from tests/accept/run/tcnstseq.nim
rename to tests/run/tcnstseq.nim
diff --git a/tests/accept/run/tcnstseq2.nim b/tests/run/tcnstseq2.nim
similarity index 100%
rename from tests/accept/run/tcnstseq2.nim
rename to tests/run/tcnstseq2.nim
diff --git a/tests/accept/run/tcnstseq3.nim b/tests/run/tcnstseq3.nim
similarity index 100%
rename from tests/accept/run/tcnstseq3.nim
rename to tests/run/tcnstseq3.nim
diff --git a/tests/accept/run/tconstr2.nim b/tests/run/tconstr2.nim
similarity index 100%
rename from tests/accept/run/tconstr2.nim
rename to tests/run/tconstr2.nim
diff --git a/tests/accept/run/tcontinuexc.nim b/tests/run/tcontinuexc.nim
similarity index 100%
rename from tests/accept/run/tcontinuexc.nim
rename to tests/run/tcontinuexc.nim
diff --git a/tests/accept/run/tcopy.nim b/tests/run/tcopy.nim
similarity index 100%
rename from tests/accept/run/tcopy.nim
rename to tests/run/tcopy.nim
diff --git a/tests/accept/run/tcountup.nim b/tests/run/tcountup.nim
similarity index 100%
rename from tests/accept/run/tcountup.nim
rename to tests/run/tcountup.nim
diff --git a/tests/accept/run/tcurrncy.nim b/tests/run/tcurrncy.nim
similarity index 100%
rename from tests/accept/run/tcurrncy.nim
rename to tests/run/tcurrncy.nim
diff --git a/tests/accept/run/temit.nim b/tests/run/temit.nim
similarity index 100%
rename from tests/accept/run/temit.nim
rename to tests/run/temit.nim
diff --git a/tests/accept/run/tenumhole.nim b/tests/run/tenumhole.nim
similarity index 100%
rename from tests/accept/run/tenumhole.nim
rename to tests/run/tenumhole.nim
diff --git a/tests/accept/run/teventemitter.nim b/tests/run/teventemitter.nim
similarity index 100%
rename from tests/accept/run/teventemitter.nim
rename to tests/run/teventemitter.nim
diff --git a/tests/accept/run/tevents.nim b/tests/run/tevents.nim
similarity index 100%
rename from tests/accept/run/tevents.nim
rename to tests/run/tevents.nim
diff --git a/tests/accept/run/texcsub.nim b/tests/run/texcsub.nim
similarity index 100%
rename from tests/accept/run/texcsub.nim
rename to tests/run/texcsub.nim
diff --git a/tests/accept/run/texplicitgeneric1.nim b/tests/run/texplicitgeneric1.nim
similarity index 100%
rename from tests/accept/run/texplicitgeneric1.nim
rename to tests/run/texplicitgeneric1.nim
diff --git a/tests/accept/run/texplicitgeneric2.nim b/tests/run/texplicitgeneric2.nim
similarity index 100%
rename from tests/accept/run/texplicitgeneric2.nim
rename to tests/run/texplicitgeneric2.nim
diff --git a/tests/accept/run/tfielditerator.nim b/tests/run/tfielditerator.nim
similarity index 100%
rename from tests/accept/run/tfielditerator.nim
rename to tests/run/tfielditerator.nim
diff --git a/tests/accept/run/tfinally.nim b/tests/run/tfinally.nim
similarity index 100%
rename from tests/accept/run/tfinally.nim
rename to tests/run/tfinally.nim
diff --git a/tests/accept/run/tfinally2.nim b/tests/run/tfinally2.nim
similarity index 100%
rename from tests/accept/run/tfinally2.nim
rename to tests/run/tfinally2.nim
diff --git a/tests/accept/run/tfinally3.nim b/tests/run/tfinally3.nim
similarity index 100%
rename from tests/accept/run/tfinally3.nim
rename to tests/run/tfinally3.nim
diff --git a/tests/accept/run/tfloat1.nim b/tests/run/tfloat1.nim
similarity index 100%
rename from tests/accept/run/tfloat1.nim
rename to tests/run/tfloat1.nim
diff --git a/tests/accept/run/tfloat2.nim b/tests/run/tfloat2.nim
similarity index 100%
rename from tests/accept/run/tfloat2.nim
rename to tests/run/tfloat2.nim
diff --git a/tests/accept/run/tfloat3.nim b/tests/run/tfloat3.nim
similarity index 100%
rename from tests/accept/run/tfloat3.nim
rename to tests/run/tfloat3.nim
diff --git a/tests/accept/run/tformat.nim b/tests/run/tformat.nim
similarity index 100%
rename from tests/accept/run/tformat.nim
rename to tests/run/tformat.nim
diff --git a/tests/accept/run/tfriends.nim b/tests/run/tfriends.nim
similarity index 100%
rename from tests/accept/run/tfriends.nim
rename to tests/run/tfriends.nim
diff --git a/tests/accept/run/tgenericassign.nim b/tests/run/tgenericassign.nim
similarity index 100%
rename from tests/accept/run/tgenericassign.nim
rename to tests/run/tgenericassign.nim
diff --git a/tests/accept/run/tgenericassigntuples.nim b/tests/run/tgenericassigntuples.nim
similarity index 100%
rename from tests/accept/run/tgenericassigntuples.nim
rename to tests/run/tgenericassigntuples.nim
diff --git a/tests/accept/run/tgenericprocvar.nim b/tests/run/tgenericprocvar.nim
similarity index 100%
rename from tests/accept/run/tgenericprocvar.nim
rename to tests/run/tgenericprocvar.nim
diff --git a/tests/accept/run/tgenerics1.nim b/tests/run/tgenerics1.nim
similarity index 100%
rename from tests/accept/run/tgenerics1.nim
rename to tests/run/tgenerics1.nim
diff --git a/tests/accept/run/thintoff.nim b/tests/run/thintoff.nim
similarity index 100%
rename from tests/accept/run/thintoff.nim
rename to tests/run/thintoff.nim
diff --git a/tests/accept/run/tidgen.nim b/tests/run/tidgen.nim
similarity index 100%
rename from tests/accept/run/tidgen.nim
rename to tests/run/tidgen.nim
diff --git a/tests/accept/run/tinit.nim b/tests/run/tinit.nim
similarity index 100%
rename from tests/accept/run/tinit.nim
rename to tests/run/tinit.nim
diff --git a/tests/accept/run/tints.nim b/tests/run/tints.nim
similarity index 100%
rename from tests/accept/run/tints.nim
rename to tests/run/tints.nim
diff --git a/tests/accept/run/tisopr.nim b/tests/run/tisopr.nim
similarity index 100%
rename from tests/accept/run/tisopr.nim
rename to tests/run/tisopr.nim
diff --git a/tests/accept/run/titer3.nim b/tests/run/titer3.nim
similarity index 100%
rename from tests/accept/run/titer3.nim
rename to tests/run/titer3.nim
diff --git a/tests/accept/run/titer5.nim b/tests/run/titer5.nim
similarity index 100%
rename from tests/accept/run/titer5.nim
rename to tests/run/titer5.nim
diff --git a/tests/accept/run/titer6.nim b/tests/run/titer6.nim
similarity index 100%
rename from tests/accept/run/titer6.nim
rename to tests/run/titer6.nim
diff --git a/tests/accept/run/titervaropenarray.nim b/tests/run/titervaropenarray.nim
similarity index 100%
rename from tests/accept/run/titervaropenarray.nim
rename to tests/run/titervaropenarray.nim
diff --git a/tests/accept/run/tkoeniglookup.nim b/tests/run/tkoeniglookup.nim
similarity index 100%
rename from tests/accept/run/tkoeniglookup.nim
rename to tests/run/tkoeniglookup.nim
diff --git a/tests/accept/run/tlenopenarray.nim b/tests/run/tlenopenarray.nim
similarity index 100%
rename from tests/accept/run/tlenopenarray.nim
rename to tests/run/tlenopenarray.nim
diff --git a/tests/accept/run/tlists.nim b/tests/run/tlists.nim
similarity index 100%
rename from tests/accept/run/tlists.nim
rename to tests/run/tlists.nim
diff --git a/tests/accept/run/tlowhigh.nim b/tests/run/tlowhigh.nim
similarity index 100%
rename from tests/accept/run/tlowhigh.nim
rename to tests/run/tlowhigh.nim
diff --git a/tests/accept/run/tmacro2.nim b/tests/run/tmacro2.nim
similarity index 100%
rename from tests/accept/run/tmacro2.nim
rename to tests/run/tmacro2.nim
diff --git a/tests/accept/run/tmacro3.nim b/tests/run/tmacro3.nim
similarity index 100%
rename from tests/accept/run/tmacro3.nim
rename to tests/run/tmacro3.nim
diff --git a/tests/accept/run/tmacro4.nim b/tests/run/tmacro4.nim
similarity index 100%
rename from tests/accept/run/tmacro4.nim
rename to tests/run/tmacro4.nim
diff --git a/tests/accept/run/tmacros1.nim b/tests/run/tmacros1.nim
similarity index 100%
rename from tests/accept/run/tmacros1.nim
rename to tests/run/tmacros1.nim
diff --git a/tests/accept/run/tmatrix.nim b/tests/run/tmatrix.nim
similarity index 100%
rename from tests/accept/run/tmatrix.nim
rename to tests/run/tmatrix.nim
diff --git a/tests/accept/run/tmethods1.nim b/tests/run/tmethods1.nim
similarity index 100%
rename from tests/accept/run/tmethods1.nim
rename to tests/run/tmethods1.nim
diff --git a/tests/accept/run/tmoditer.nim b/tests/run/tmoditer.nim
similarity index 100%
rename from tests/accept/run/tmoditer.nim
rename to tests/run/tmoditer.nim
diff --git a/tests/accept/run/tmultim1.nim b/tests/run/tmultim1.nim
similarity index 100%
rename from tests/accept/run/tmultim1.nim
rename to tests/run/tmultim1.nim
diff --git a/tests/accept/run/tmultim2.nim b/tests/run/tmultim2.nim
similarity index 100%
rename from tests/accept/run/tmultim2.nim
rename to tests/run/tmultim2.nim
diff --git a/tests/accept/run/tmultim3.nim b/tests/run/tmultim3.nim
similarity index 100%
rename from tests/accept/run/tmultim3.nim
rename to tests/run/tmultim3.nim
diff --git a/tests/accept/run/tmultim4.nim b/tests/run/tmultim4.nim
similarity index 100%
rename from tests/accept/run/tmultim4.nim
rename to tests/run/tmultim4.nim
diff --git a/tests/accept/run/tnamedenumfields.nim b/tests/run/tnamedenumfields.nim
similarity index 100%
rename from tests/accept/run/tnamedenumfields.nim
rename to tests/run/tnamedenumfields.nim
diff --git a/tests/accept/run/tnestif.nim b/tests/run/tnestif.nim
similarity index 100%
rename from tests/accept/run/tnestif.nim
rename to tests/run/tnestif.nim
diff --git a/tests/accept/run/tnestprc.nim b/tests/run/tnestprc.nim
similarity index 100%
rename from tests/accept/run/tnestprc.nim
rename to tests/run/tnestprc.nim
diff --git a/tests/accept/run/tnewderef.nim b/tests/run/tnewderef.nim
similarity index 100%
rename from tests/accept/run/tnewderef.nim
rename to tests/run/tnewderef.nim
diff --git a/tests/accept/run/tnodeadlocks.nim b/tests/run/tnodeadlocks.nim
similarity index 100%
rename from tests/accept/run/tnodeadlocks.nim
rename to tests/run/tnodeadlocks.nim
diff --git a/tests/accept/run/tofopr.nim b/tests/run/tofopr.nim
similarity index 100%
rename from tests/accept/run/tofopr.nim
rename to tests/run/tofopr.nim
diff --git a/tests/accept/run/toop1.nim b/tests/run/toop1.nim
similarity index 100%
rename from tests/accept/run/toop1.nim
rename to tests/run/toop1.nim
diff --git a/tests/accept/run/topenarrayrepr.nim b/tests/run/topenarrayrepr.nim
similarity index 100%
rename from tests/accept/run/topenarrayrepr.nim
rename to tests/run/topenarrayrepr.nim
diff --git a/tests/accept/run/topenlen.nim b/tests/run/topenlen.nim
similarity index 100%
rename from tests/accept/run/topenlen.nim
rename to tests/run/topenlen.nim
diff --git a/tests/accept/run/toprprec.nim b/tests/run/toprprec.nim
similarity index 100%
rename from tests/accept/run/toprprec.nim
rename to tests/run/toprprec.nim
diff --git a/tests/accept/run/toverflw.nim b/tests/run/toverflw.nim
similarity index 100%
rename from tests/accept/run/toverflw.nim
rename to tests/run/toverflw.nim
diff --git a/tests/accept/run/toverflw2.nim b/tests/run/toverflw2.nim
similarity index 100%
rename from tests/accept/run/toverflw2.nim
rename to tests/run/toverflw2.nim
diff --git a/tests/accept/run/toverl2.nim b/tests/run/toverl2.nim
similarity index 100%
rename from tests/accept/run/toverl2.nim
rename to tests/run/toverl2.nim
diff --git a/tests/accept/run/toverlop.nim b/tests/run/toverlop.nim
similarity index 100%
rename from tests/accept/run/toverlop.nim
rename to tests/run/toverlop.nim
diff --git a/tests/accept/run/toverwr.nim b/tests/run/toverwr.nim
similarity index 100%
rename from tests/accept/run/toverwr.nim
rename to tests/run/toverwr.nim
diff --git a/tests/accept/run/tovfint.nim b/tests/run/tovfint.nim
similarity index 100%
rename from tests/accept/run/tovfint.nim
rename to tests/run/tovfint.nim
diff --git a/tests/accept/run/tpegs.nim b/tests/run/tpegs.nim
similarity index 100%
rename from tests/accept/run/tpegs.nim
rename to tests/run/tpegs.nim
diff --git a/tests/accept/run/tpos.nim b/tests/run/tpos.nim
similarity index 100%
rename from tests/accept/run/tpos.nim
rename to tests/run/tpos.nim
diff --git a/tests/accept/run/tprecedence.nim b/tests/run/tprecedence.nim
similarity index 100%
rename from tests/accept/run/tprecedence.nim
rename to tests/run/tprecedence.nim
diff --git a/tests/accept/run/tprintf.nim b/tests/run/tprintf.nim
similarity index 100%
rename from tests/accept/run/tprintf.nim
rename to tests/run/tprintf.nim
diff --git a/tests/accept/run/tprocvar.nim b/tests/run/tprocvar.nim
similarity index 100%
rename from tests/accept/run/tprocvar.nim
rename to tests/run/tprocvar.nim
diff --git a/tests/accept/run/tquotewords.nim b/tests/run/tquotewords.nim
similarity index 100%
rename from tests/accept/run/tquotewords.nim
rename to tests/run/tquotewords.nim
diff --git a/tests/accept/run/tregex.nim b/tests/run/tregex.nim
similarity index 100%
rename from tests/accept/run/tregex.nim
rename to tests/run/tregex.nim
diff --git a/tests/accept/run/treguse.nim b/tests/run/treguse.nim
similarity index 100%
rename from tests/accept/run/treguse.nim
rename to tests/run/treguse.nim
diff --git a/tests/accept/run/trepr.nim b/tests/run/trepr.nim
similarity index 100%
rename from tests/accept/run/trepr.nim
rename to tests/run/trepr.nim
diff --git a/tests/accept/run/treraise.nim b/tests/run/treraise.nim
similarity index 100%
rename from tests/accept/run/treraise.nim
rename to tests/run/treraise.nim
diff --git a/tests/accept/run/tromans.nim b/tests/run/tromans.nim
similarity index 100%
rename from tests/accept/run/tromans.nim
rename to tests/run/tromans.nim
diff --git a/tests/accept/run/tseqcon.nim b/tests/run/tseqcon.nim
similarity index 100%
rename from tests/accept/run/tseqcon.nim
rename to tests/run/tseqcon.nim
diff --git a/tests/accept/run/tseqtuple.nim b/tests/run/tseqtuple.nim
similarity index 100%
rename from tests/accept/run/tseqtuple.nim
rename to tests/run/tseqtuple.nim
diff --git a/tests/accept/run/tsequtils.nim b/tests/run/tsequtils.nim
similarity index 100%
rename from tests/accept/run/tsequtils.nim
rename to tests/run/tsequtils.nim
diff --git a/tests/accept/run/tsets.nim b/tests/run/tsets.nim
similarity index 100%
rename from tests/accept/run/tsets.nim
rename to tests/run/tsets.nim
diff --git a/tests/accept/run/tsets2.nim b/tests/run/tsets2.nim
similarity index 100%
rename from tests/accept/run/tsets2.nim
rename to tests/run/tsets2.nim
diff --git a/tests/accept/run/tsidee2.nim b/tests/run/tsidee2.nim
similarity index 100%
rename from tests/accept/run/tsidee2.nim
rename to tests/run/tsidee2.nim
diff --git a/tests/accept/run/tsidee3.nim b/tests/run/tsidee3.nim
similarity index 100%
rename from tests/accept/run/tsidee3.nim
rename to tests/run/tsidee3.nim
diff --git a/tests/accept/run/tsimmeth.nim b/tests/run/tsimmeth.nim
similarity index 100%
rename from tests/accept/run/tsimmeth.nim
rename to tests/run/tsimmeth.nim
diff --git a/tests/accept/run/tsimplesort.nim b/tests/run/tsimplesort.nim
similarity index 100%
rename from tests/accept/run/tsimplesort.nim
rename to tests/run/tsimplesort.nim
diff --git a/tests/accept/run/tslices.nim b/tests/run/tslices.nim
similarity index 100%
rename from tests/accept/run/tslices.nim
rename to tests/run/tslices.nim
diff --git a/tests/accept/run/tsplit.nim b/tests/run/tsplit.nim
similarity index 100%
rename from tests/accept/run/tsplit.nim
rename to tests/run/tsplit.nim
diff --git a/tests/accept/run/tstrange.nim b/tests/run/tstrange.nim
similarity index 100%
rename from tests/accept/run/tstrange.nim
rename to tests/run/tstrange.nim
diff --git a/tests/accept/run/tstringinterp.nim b/tests/run/tstringinterp.nim
similarity index 100%
rename from tests/accept/run/tstringinterp.nim
rename to tests/run/tstringinterp.nim
diff --git a/tests/accept/run/tstrlits.nim b/tests/run/tstrlits.nim
similarity index 100%
rename from tests/accept/run/tstrlits.nim
rename to tests/run/tstrlits.nim
diff --git a/tests/accept/run/tstrutil.nim b/tests/run/tstrutil.nim
similarity index 100%
rename from tests/accept/run/tstrutil.nim
rename to tests/run/tstrutil.nim
diff --git a/tests/accept/run/ttables.nim b/tests/run/ttables.nim
similarity index 100%
rename from tests/accept/run/ttables.nim
rename to tests/run/ttables.nim
diff --git a/tests/accept/run/ttoseq.nim b/tests/run/ttoseq.nim
similarity index 100%
rename from tests/accept/run/ttoseq.nim
rename to tests/run/ttoseq.nim
diff --git a/tests/accept/run/tunhandledexc.nim b/tests/run/tunhandledexc.nim
similarity index 100%
rename from tests/accept/run/tunhandledexc.nim
rename to tests/run/tunhandledexc.nim
diff --git a/tests/accept/run/tunidecode.nim b/tests/run/tunidecode.nim
similarity index 100%
rename from tests/accept/run/tunidecode.nim
rename to tests/run/tunidecode.nim
diff --git a/tests/accept/run/tusingstatement.nim b/tests/run/tusingstatement.nim
similarity index 100%
rename from tests/accept/run/tusingstatement.nim
rename to tests/run/tusingstatement.nim
diff --git a/tests/accept/run/tvardecl.nim b/tests/run/tvardecl.nim
similarity index 100%
rename from tests/accept/run/tvardecl.nim
rename to tests/run/tvardecl.nim
diff --git a/tests/accept/run/tvariantasgn.nim b/tests/run/tvariantasgn.nim
similarity index 100%
rename from tests/accept/run/tvariantasgn.nim
rename to tests/run/tvariantasgn.nim
diff --git a/tests/accept/run/tvariantstack.nim b/tests/run/tvariantstack.nim
similarity index 100%
rename from tests/accept/run/tvariantstack.nim
rename to tests/run/tvariantstack.nim
diff --git a/tests/accept/run/tvarnums.nim b/tests/run/tvarnums.nim
similarity index 100%
rename from tests/accept/run/tvarnums.nim
rename to tests/run/tvarnums.nim
diff --git a/tests/accept/run/tvarres1.nim b/tests/run/tvarres1.nim
similarity index 100%
rename from tests/accept/run/tvarres1.nim
rename to tests/run/tvarres1.nim
diff --git a/tests/accept/run/tvarres2.nim b/tests/run/tvarres2.nim
similarity index 100%
rename from tests/accept/run/tvarres2.nim
rename to tests/run/tvarres2.nim
diff --git a/tests/accept/run/tvartup.nim b/tests/run/tvartup.nim
similarity index 100%
rename from tests/accept/run/tvartup.nim
rename to tests/run/tvartup.nim
diff --git a/tests/accept/run/twrongexc.nim b/tests/run/twrongexc.nim
similarity index 100%
rename from tests/accept/run/twrongexc.nim
rename to tests/run/twrongexc.nim
diff --git a/tests/accept/run/txmlgen.nim b/tests/run/txmlgen.nim
similarity index 100%
rename from tests/accept/run/txmlgen.nim
rename to tests/run/txmlgen.nim
diff --git a/tests/accept/run/txmltree.nim b/tests/run/txmltree.nim
similarity index 100%
rename from tests/accept/run/txmltree.nim
rename to tests/run/txmltree.nim
diff --git a/tests/tester.nim b/tests/tester.nim
index 9f59e7da3e..5f70b8f5bf 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":