From d22964cdb6627990b023fedda1b626808fc4f7d9 Mon Sep 17 00:00:00 2001
From: Sebastian Jeong <sebastianrcnt@gmail.com>
Date: Mon, 17 Aug 2026 04:14:30 +0900
Subject: [PATCH] =?UTF-8?q?tests:=20fixture=20=ED=8C=8C=EC=9D=BC=EB=AA=85?=
 =?UTF-8?q?=EA=B3=BC=20unit=20=EB=8F=99=EA=B8=B0=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fec/tests/format/{bad_bufw.fe => badfbuf.fe}   | 3 ++-
 fec/tests/format/{bad_cls.fe => badfcls.fe}    | 3 ++-
 fec/tests/format/{bad_many.fe => badfmany.fe}  | 3 ++-
 fec/tests/format/{bad_ari.fe => badfmta.fe}    | 3 ++-
 fec/tests/format/{bad_open.fe => badfopen.fe}  | 3 ++-
 fec/tests/format/{bad_run.fe => badfrun.fe}    | 3 ++-
 fec/tests/format/{bad_try.fe => badftry.fe}    | 3 ++-
 fec/tests/format/{bad_type.fe => badftype.fe}  | 3 ++-
 fec/tests/format/{bad_verb.fe => badfverb.fe}  | 3 ++-
 fec/tests/format/{bad_writ.fe => badfwrit.fe}  | 3 ++-
 fec/tests/format/{ok_forma.fe => okfmt.fe}     | 3 ++-
 fec/tests/format/{ok_prop.fe => okprop.fe}     | 3 ++-
 fec/tests/format/{ok_try_f.fe => oktryf.fe}    | 3 ++-
 fec/tests/optional/{badcatch.fe => badcatc.fe} | 3 ++-
 fec/tests/optional/{baddef.fe => baddefi.fe}   | 4 +++-
 fec/tests/optional/{badercod.fe => badecod.fe} | 3 ++-
 fec/tests/optional/{badernam.fe => badenam.fe} | 3 ++-
 fec/tests/optional/{badetype.fe => badetyp.fe} | 4 +++-
 fec/tests/optional/{baddir.fe => badidir.fe}   | 3 ++-
 fec/tests/optional/{badnull.fe => badnullv.fe} | 4 +++-
 fec/tests/optional/{badoref.fe => badorefv.fe} | 4 +++-
 fec/tests/optional/{badorel.fe => badorlx.fe}  | 4 +++-
 fec/tests/optional/{badproj.fe => badprjv.fe}  | 4 +++-
 fec/tests/optional/{badqmark.fe => badqmkv.fe} | 4 +++-
 fec/tests/optional/{badret.fe => badrett.fe}   | 3 ++-
 fec/tests/optional/{badsome.fe => badsomev.fe} | 4 +++-
 fec/tests/optional/{badtry.fe => badtryx.fe}   | 4 +++-
 fec/tests/optional/{badzero.fe => badzero1.fe} | 4 +++-
 fec/tests/optional/{okcatch.fe => okcatc.fe}   | 3 ++-
 fec/tests/optional/{okcatmov.fe => okcatmv.fe} | 3 ++-
 fec/tests/optional/{okcvoid.fe => okcvd.fe}    | 3 ++-
 fec/tests/optional/{okdeflt.fe => okdefl.fe}   | 3 ++-
 fec/tests/optional/{okiflet.fe => okiflt.fe}   | 4 +++-
 fec/tests/optional/{okmatch.fe => okmtch.fe}   | 4 +++-
 fec/tests/optional/{oknull.fe => oknull1.fe}   | 4 +++-
 fec/tests/optional/{okorelse.fe => okorel.fe}  | 3 ++-
 fec/tests/optional/{okproj.fe => okproj1.fe}   | 4 +++-
 fec/tests/optional/{okpatvw.fe => okptvw.fe}   | 4 +++-
 fec/tests/optional/{okrepl.fe => okrepl2.fe}   | 4 +++-
 fec/tests/optional/{oktrdef.fe => oktrd2.fe}   | 4 +++-
 fec/tests/optional/{oktry.fe => oktry2.fe}     | 4 +++-
 fec/tests/own/{badarg.fe => badargu.fe}        | 4 +++-
 fec/tests/own/{badbrmov.fe => badbrmv.fe}      | 3 ++-
 fec/tests/own/{bad_clos.fe => badclos.fe}      | 3 ++-
 fec/tests/own/{bad_cond.fe => badcond.fe}      | 3 ++-
 fec/tests/own/{bad_dbl.fe => baddbl.fe}        | 3 ++-
 fec/tests/own/{baddefer.fe => baddefr.fe}      | 3 ++-
 fec/tests/own/{bad_dest.fe => baddest.fe}      | 3 ++-
 fec/tests/own/{bad_drop.fe => baddrop.fe}      | 3 ++-
 fec/tests/own/{badfld.fe => badfmem.fe}        | 3 ++-
 fec/tests/own/{badglob.fe => badglobx.fe}      | 4 +++-
 fec/tests/own/{badbinit.fe => badinit.fe}      | 3 ++-
 fec/tests/own/{badinv.fe => badinvr.fe}        | 4 +++-
 fec/tests/own/{bad_loop.fe => badlop1.fe}      | 3 ++-
 fec/tests/own/{badloop.fe => badlp2.fe}        | 3 ++-
 fec/tests/own/{badmut.fe => badmutv.fe}        | 4 +++-
 fec/tests/own/{badmut2.fe => badmutx.fe}       | 4 +++-
 fec/tests/own/{bad_move.fe => badmv1.fe}       | 3 ++-
 fec/tests/own/{badmove.fe => badmv2.fe}        | 3 ++-
 fec/tests/own/{bad_proj.fe => badproj.fe}      | 3 ++-
 fec/tests/own/{badptr.fe => badptrx.fe}        | 4 +++-
 fec/tests/own/{badret.fe => badretv.fe}        | 3 ++-
 fec/tests/own/{badrfld.fe => badrfie.fe}       | 4 +++-
 fec/tests/own/{badridx.fe => badri2.fe}        | 4 +++-
 fec/tests/own/{badscop.fe => badscp1.fe}       | 4 +++-
 fec/tests/own/{badself.fe => badselfw.fe}      | 4 +++-
 fec/tests/own/{badshwr.fe => badshw1.fe}       | 4 +++-
 fec/tests/own/{badtwo.fe => badtwo2.fe}        | 4 +++-
 fec/tests/own/{badup.fe => badup1.fe}          | 4 +++-
 fec/tests/own/{badweak.fe => badweak2.fe}      | 4 +++-
 fec/tests/own/{okbranch.fe => okbrch.fe}       | 4 +++-
 fec/tests/own/{ok_defer.fe => okdefer1.fe}     | 3 ++-
 fec/tests/own/{okdefer.fe => okdefer2.fe}      | 3 ++-
 fec/tests/own/{okglobcp.fe => okglobc.fe}      | 3 ++-
 fec/tests/own/{oklast.fe => oklast1.fe}        | 4 +++-
 fec/tests/own/{ok_owned.fe => okowned.fe}      | 3 ++-
 fec/tests/own/{okr8free.fe => okr8fr.fe}       | 4 +++-
 fec/tests/own/{okr8join.fe => okr8jn.fe}       | 4 +++-
 fec/tests/own/{okr8meth.fe => okr8mt.fe}       | 4 +++-
 fec/tests/own/{okr8stat.fe => okr8st.fe}       | 4 +++-
 fec/tests/own/{okrebor.fe => okrbor1.fe}       | 4 +++-
 fec/tests/own/{okrtlast.fe => okrtls.fe}       | 4 +++-
 fec/tests/own/{okshare.fe => okshar1.fe}       | 4 +++-
 fec/tests/own/{okslreb.fe => okslre1.fe}       | 4 +++-
 fec/tests/own/{okstatic.fe => okstat1.fe}      | 4 +++-
 fec/tests/own/{oktemp.fe => oktemp1.fe}        | 4 +++-
 fec/tests/own/{oktrim.fe => oktrim1.fe}        | 4 +++-
 fec/tests/own/{okwcall.fe => okwcal1.fe}       | 4 +++-
 fec/tests/types/{bad_ari.fe => badarith.fe}    | 3 ++-
 fec/tests/types/{badarr.fe => badarry.fe}      | 3 ++-
 fec/tests/types/{bad_asgn.fe => badasgn.fe}    | 3 ++-
 fec/tests/types/{badchar.fe => badbyte.fe}     | 3 ++-
 fec/tests/types/{bad_cast.fe => badcast.fe}    | 3 ++-
 fec/tests/types/{bad_cond.fe => badcond.fe}    | 3 ++-
 fec/tests/types/{badcycle.fe => badcyc.fe}     | 4 +++-
 fec/tests/types/{badfield.fe => badfiel.fe}    | 3 ++-
 fec/tests/types/{badfld.fe => badfmem.fe}      | 3 ++-
 fec/tests/types/{badindex.fe => badidx.fe}     | 3 ++-
 fec/tests/types/{badmat.fe => badmatch.fe}     | 3 ++-
 fec/tests/types/{bad_mlet.fe => badmlet.fe}    | 3 ++-
 fec/tests/types/{bad_ret.fe => badretu.fe}     | 3 ++-
 fec/tests/types/{bad_shwr.fe => badshwr.fe}    | 3 ++-
 fec/tests/types/{badstr.fe => badstrg.fe}      | 3 ++-
 fec/tests/types/{bad_type.fe => badtype.fe}    | 3 ++-
 fec/tests/types/{bad_unit.fe => badunit.fe}    | 4 +++-
 fec/tests/types/{bad_unk.fe => badunk.fe}      | 3 ++-
 fec/tests/types/{bad_void.fe => badvoid.fe}    | 3 ++-
 fec/tests/types/{ok_arra1.fe => okarra1.fe}    | 3 ++-
 fec/tests/types/{ok_array.fe => okarray.fe}    | 3 ++-
 fec/tests/types/{ok_castw.fe => okcastw.fe}    | 3 ++-
 fec/tests/types/{ok_char.fe => okcharc.fe}     | 3 ++-
 fec/tests/types/{ok_enum.fe => okenum.fe}      | 3 ++-
 fec/tests/types/{ok_for.fe => okfor.fe}        | 3 ++-
 fec/tests/types/{ok_hello.fe => okhello.fe}    | 3 ++-
 fec/tests/types/{ok_mutab.fe => okmutab.fe}    | 3 ++-
 fec/tests/types/{ok_neste.fe => okneste.fe}    | 3 ++-
 fec/tests/types/{ok_scope.fe => okscope.fe}    | 3 ++-
 fec/tests/types/{ok_str.fe => okstrg.fe}       | 3 ++-
 fec/tests/types/{ok_struc.fe => okstruc.fe}    | 3 ++-
 119 files changed, 286 insertions(+), 119 deletions(-)
 rename fec/tests/format/{bad_bufw.fe => badfbuf.fe} (89%)
 rename fec/tests/format/{bad_cls.fe => badfcls.fe} (78%)
 rename fec/tests/format/{bad_many.fe => badfmany.fe} (78%)
 rename fec/tests/format/{bad_ari.fe => badfmta.fe} (80%)
 rename fec/tests/format/{bad_open.fe => badfopen.fe} (77%)
 rename fec/tests/format/{bad_run.fe => badfrun.fe} (84%)
 rename fec/tests/format/{bad_try.fe => badftry.fe} (80%)
 rename fec/tests/format/{bad_type.fe => badftype.fe} (87%)
 rename fec/tests/format/{bad_verb.fe => badfverb.fe} (78%)
 rename fec/tests/format/{bad_writ.fe => badfwrit.fe} (83%)
 rename fec/tests/format/{ok_forma.fe => okfmt.fe} (98%)
 rename fec/tests/format/{ok_prop.fe => okprop.fe} (84%)
 rename fec/tests/format/{ok_try_f.fe => oktryf.fe} (91%)
 rename fec/tests/optional/{badcatch.fe => badcatc.fe} (92%)
 rename fec/tests/optional/{baddef.fe => baddefi.fe} (89%)
 rename fec/tests/optional/{badercod.fe => badecod.fe} (80%)
 rename fec/tests/optional/{badernam.fe => badenam.fe} (80%)
 rename fec/tests/optional/{badetype.fe => badetyp.fe} (90%)
 rename fec/tests/optional/{baddir.fe => badidir.fe} (87%)
 rename fec/tests/optional/{badnull.fe => badnullv.fe} (76%)
 rename fec/tests/optional/{badoref.fe => badorefv.fe} (76%)
 rename fec/tests/optional/{badorel.fe => badorlx.fe} (89%)
 rename fec/tests/optional/{badproj.fe => badprjv.fe} (88%)
 rename fec/tests/optional/{badqmark.fe => badqmkv.fe} (82%)
 rename fec/tests/optional/{badret.fe => badrett.fe} (88%)
 rename fec/tests/optional/{badsome.fe => badsomev.fe} (80%)
 rename fec/tests/optional/{badtry.fe => badtryx.fe} (88%)
 rename fec/tests/optional/{badzero.fe => badzero1.fe} (70%)
 rename fec/tests/optional/{okcatch.fe => okcatc.fe} (92%)
 rename fec/tests/optional/{okcatmov.fe => okcatmv.fe} (90%)
 rename fec/tests/optional/{okcvoid.fe => okcvd.fe} (90%)
 rename fec/tests/optional/{okdeflt.fe => okdefl.fe} (89%)
 rename fec/tests/optional/{okiflet.fe => okiflt.fe} (86%)
 rename fec/tests/optional/{okmatch.fe => okmtch.fe} (88%)
 rename fec/tests/optional/{oknull.fe => oknull1.fe} (90%)
 rename fec/tests/optional/{okorelse.fe => okorel.fe} (77%)
 rename fec/tests/optional/{okproj.fe => okproj1.fe} (84%)
 rename fec/tests/optional/{okpatvw.fe => okptvw.fe} (93%)
 rename fec/tests/optional/{okrepl.fe => okrepl2.fe} (90%)
 rename fec/tests/optional/{oktrdef.fe => oktrd2.fe} (90%)
 rename fec/tests/optional/{oktry.fe => oktry2.fe} (90%)
 rename fec/tests/own/{badarg.fe => badargu.fe} (90%)
 rename fec/tests/own/{badbrmov.fe => badbrmv.fe} (89%)
 rename fec/tests/own/{bad_clos.fe => badclos.fe} (94%)
 rename fec/tests/own/{bad_cond.fe => badcond.fe} (89%)
 rename fec/tests/own/{bad_dbl.fe => baddbl.fe} (83%)
 rename fec/tests/own/{baddefer.fe => baddefr.fe} (92%)
 rename fec/tests/own/{bad_dest.fe => baddest.fe} (76%)
 rename fec/tests/own/{bad_drop.fe => baddrop.fe} (90%)
 rename fec/tests/own/{badfld.fe => badfmem.fe} (78%)
 rename fec/tests/own/{badglob.fe => badglobx.fe} (84%)
 rename fec/tests/own/{badbinit.fe => badinit.fe} (90%)
 rename fec/tests/own/{badinv.fe => badinvr.fe} (88%)
 rename fec/tests/own/{bad_loop.fe => badlop1.fe} (88%)
 rename fec/tests/own/{badloop.fe => badlp2.fe} (90%)
 rename fec/tests/own/{badmut.fe => badmutv.fe} (87%)
 rename fec/tests/own/{badmut2.fe => badmutx.fe} (89%)
 rename fec/tests/own/{bad_move.fe => badmv1.fe} (87%)
 rename fec/tests/own/{badmove.fe => badmv2.fe} (90%)
 rename fec/tests/own/{bad_proj.fe => badproj.fe} (88%)
 rename fec/tests/own/{badptr.fe => badptrx.fe} (79%)
 rename fec/tests/own/{badret.fe => badretv.fe} (83%)
 rename fec/tests/own/{badrfld.fe => badrfie.fe} (90%)
 rename fec/tests/own/{badridx.fe => badri2.fe} (90%)
 rename fec/tests/own/{badscop.fe => badscp1.fe} (92%)
 rename fec/tests/own/{badself.fe => badselfw.fe} (87%)
 rename fec/tests/own/{badshwr.fe => badshw1.fe} (90%)
 rename fec/tests/own/{badtwo.fe => badtwo2.fe} (82%)
 rename fec/tests/own/{badup.fe => badup1.fe} (89%)
 rename fec/tests/own/{badweak.fe => badweak2.fe} (87%)
 rename fec/tests/own/{okbranch.fe => okbrch.fe} (93%)
 rename fec/tests/own/{ok_defer.fe => okdefer1.fe} (80%)
 rename fec/tests/own/{okdefer.fe => okdefer2.fe} (92%)
 rename fec/tests/own/{okglobcp.fe => okglobc.fe} (89%)
 rename fec/tests/own/{oklast.fe => oklast1.fe} (86%)
 rename fec/tests/own/{ok_owned.fe => okowned.fe} (91%)
 rename fec/tests/own/{okr8free.fe => okr8fr.fe} (92%)
 rename fec/tests/own/{okr8join.fe => okr8jn.fe} (94%)
 rename fec/tests/own/{okr8meth.fe => okr8mt.fe} (93%)
 rename fec/tests/own/{okr8stat.fe => okr8st.fe} (73%)
 rename fec/tests/own/{okrebor.fe => okrbor1.fe} (90%)
 rename fec/tests/own/{okrtlast.fe => okrtls.fe} (91%)
 rename fec/tests/own/{okshare.fe => okshar1.fe} (90%)
 rename fec/tests/own/{okslreb.fe => okslre1.fe} (91%)
 rename fec/tests/own/{okstatic.fe => okstat1.fe} (86%)
 rename fec/tests/own/{oktemp.fe => oktemp1.fe} (89%)
 rename fec/tests/own/{oktrim.fe => oktrim1.fe} (78%)
 rename fec/tests/own/{okwcall.fe => okwcal1.fe} (91%)
 rename fec/tests/types/{bad_ari.fe => badarith.fe} (85%)
 rename fec/tests/types/{badarr.fe => badarry.fe} (82%)
 rename fec/tests/types/{bad_asgn.fe => badasgn.fe} (84%)
 rename fec/tests/types/{badchar.fe => badbyte.fe} (79%)
 rename fec/tests/types/{bad_cast.fe => badcast.fe} (81%)
 rename fec/tests/types/{bad_cond.fe => badcond.fe} (79%)
 rename fec/tests/types/{badcycle.fe => badcyc.fe} (82%)
 rename fec/tests/types/{badfield.fe => badfiel.fe} (89%)
 rename fec/tests/types/{badfld.fe => badfmem.fe} (87%)
 rename fec/tests/types/{badindex.fe => badidx.fe} (84%)
 rename fec/tests/types/{badmat.fe => badmatch.fe} (87%)
 rename fec/tests/types/{bad_mlet.fe => badmlet.fe} (84%)
 rename fec/tests/types/{bad_ret.fe => badretu.fe} (72%)
 rename fec/tests/types/{bad_shwr.fe => badshwr.fe} (74%)
 rename fec/tests/types/{badstr.fe => badstrg.fe} (84%)
 rename fec/tests/types/{bad_type.fe => badtype.fe} (86%)
 rename fec/tests/types/{bad_unit.fe => badunit.fe} (78%)
 rename fec/tests/types/{bad_unk.fe => badunk.fe} (77%)
 rename fec/tests/types/{bad_void.fe => badvoid.fe} (86%)
 rename fec/tests/types/{ok_arra1.fe => okarra1.fe} (89%)
 rename fec/tests/types/{ok_array.fe => okarray.fe} (92%)
 rename fec/tests/types/{ok_castw.fe => okcastw.fe} (91%)
 rename fec/tests/types/{ok_char.fe => okcharc.fe} (91%)
 rename fec/tests/types/{ok_enum.fe => okenum.fe} (96%)
 rename fec/tests/types/{ok_for.fe => okfor.fe} (97%)
 rename fec/tests/types/{ok_hello.fe => okhello.fe} (95%)
 rename fec/tests/types/{ok_mutab.fe => okmutab.fe} (93%)
 rename fec/tests/types/{ok_neste.fe => okneste.fe} (92%)
 rename fec/tests/types/{ok_scope.fe => okscope.fe} (94%)
 rename fec/tests/types/{ok_str.fe => okstrg.fe} (89%)
 rename fec/tests/types/{ok_struc.fe => okstruc.fe} (96%)

diff --git a/fec/tests/format/bad_bufw.fe b/fec/tests/format/badfbuf.fe
similarity index 89%
rename from fec/tests/format/bad_bufw.fe
rename to fec/tests/format/badfbuf.fe
index 37bf521..2267cb8 100644
--- a/fec/tests/format/bad_bufw.fe
+++ b/fec/tests/format/badfbuf.fe
@@ -1,7 +1,8 @@
-unit bad_bufw;
+unit badfbuf;
 
 fn main() -> void {
     var raw: [4]u8 = [0, 0, 0, 0];
     var buf: []mut u8 = raw[..];
     let w = io.buf_writer(buf);
 }
+
diff --git a/fec/tests/format/bad_cls.fe b/fec/tests/format/badfcls.fe
similarity index 78%
rename from fec/tests/format/bad_cls.fe
rename to fec/tests/format/badfcls.fe
index 1f8a720..032d923 100644
--- a/fec/tests/format/bad_cls.fe
+++ b/fec/tests/format/badfcls.fe
@@ -1,6 +1,7 @@
-unit bad_cls;
+unit badfcls;
 
 fn main() -> i32 {
     @print("}", 1);
     return 0;
 }
+
diff --git a/fec/tests/format/bad_many.fe b/fec/tests/format/badfmany.fe
similarity index 78%
rename from fec/tests/format/bad_many.fe
rename to fec/tests/format/badfmany.fe
index ab25401..044e758 100644
--- a/fec/tests/format/bad_many.fe
+++ b/fec/tests/format/badfmany.fe
@@ -1,6 +1,7 @@
-unit bad_many;
+unit badfmany;
 
 fn main() -> i32 {
     @print("{}", 1, 2);
     return 0;
 }
+
diff --git a/fec/tests/format/bad_ari.fe b/fec/tests/format/badfmta.fe
similarity index 80%
rename from fec/tests/format/bad_ari.fe
rename to fec/tests/format/badfmta.fe
index 7dc30b8..01534cb 100644
--- a/fec/tests/format/bad_ari.fe
+++ b/fec/tests/format/badfmta.fe
@@ -1,6 +1,7 @@
-unit bad_ari;
+unit badfmta;
 
 fn main() -> i32 {
     @print("{} {}", 1);
     return 0;
 }
+
diff --git a/fec/tests/format/bad_open.fe b/fec/tests/format/badfopen.fe
similarity index 77%
rename from fec/tests/format/bad_open.fe
rename to fec/tests/format/badfopen.fe
index 98ee2c8..6b32d2b 100644
--- a/fec/tests/format/bad_open.fe
+++ b/fec/tests/format/badfopen.fe
@@ -1,6 +1,7 @@
-unit bad_open;
+unit badfopen;
 
 fn main() -> i32 {
     @print("{", 1);
     return 0;
 }
+
diff --git a/fec/tests/format/bad_run.fe b/fec/tests/format/badfrun.fe
similarity index 84%
rename from fec/tests/format/bad_run.fe
rename to fec/tests/format/badfrun.fe
index c7945e1..eed67b9 100644
--- a/fec/tests/format/bad_run.fe
+++ b/fec/tests/format/badfrun.fe
@@ -1,7 +1,8 @@
-unit bad_run;
+unit badfrun;
 
 fn main() -> i32 {
     var fmt: str = "{}";
     @print(fmt, 1);
     return 0;
 }
+
diff --git a/fec/tests/format/bad_try.fe b/fec/tests/format/badftry.fe
similarity index 80%
rename from fec/tests/format/bad_try.fe
rename to fec/tests/format/badftry.fe
index 0c5da62..e3fb5f6 100644
--- a/fec/tests/format/bad_try.fe
+++ b/fec/tests/format/badftry.fe
@@ -1,6 +1,7 @@
-unit bad_try;
+unit badftry;
 
 fn main() -> i32 {
     try @print("nope");
     return 0;
 }
+
diff --git a/fec/tests/format/bad_type.fe b/fec/tests/format/badftype.fe
similarity index 87%
rename from fec/tests/format/bad_type.fe
rename to fec/tests/format/badftype.fe
index 9279e47..72c4fbb 100644
--- a/fec/tests/format/bad_type.fe
+++ b/fec/tests/format/badftype.fe
@@ -1,4 +1,4 @@
-unit bad_type;
+unit badftype;
 
 struct Point { x: i32, }
 
@@ -7,3 +7,4 @@ fn main() -> i32 {
     @print("{}", p);
     return 0;
 }
+
diff --git a/fec/tests/format/bad_verb.fe b/fec/tests/format/badfverb.fe
similarity index 78%
rename from fec/tests/format/bad_verb.fe
rename to fec/tests/format/badfverb.fe
index 9a928ce..51e5308 100644
--- a/fec/tests/format/bad_verb.fe
+++ b/fec/tests/format/badfverb.fe
@@ -1,6 +1,7 @@
-unit bad_verb;
+unit badfverb;
 
 fn main() -> i32 {
     @print("{q}", 1);
     return 0;
 }
+
diff --git a/fec/tests/format/bad_writ.fe b/fec/tests/format/badfwrit.fe
similarity index 83%
rename from fec/tests/format/bad_writ.fe
rename to fec/tests/format/badfwrit.fe
index 18e33a6..f5f84a9 100644
--- a/fec/tests/format/bad_writ.fe
+++ b/fec/tests/format/badfwrit.fe
@@ -1,7 +1,8 @@
-unit bad_writ;
+unit badfwrit;
 
 fn main() -> i32 {
     var x: i32 = 0;
     @fprint(x, "bad");
     return 0;
 }
+
diff --git a/fec/tests/format/ok_forma.fe b/fec/tests/format/okfmt.fe
similarity index 98%
rename from fec/tests/format/ok_forma.fe
rename to fec/tests/format/okfmt.fe
index a830b93..5cde15b 100644
--- a/fec/tests/format/ok_forma.fe
+++ b/fec/tests/format/okfmt.fe
@@ -1,4 +1,4 @@
-unit ok_forma;
+unit okfmt;
 
 const FMT: str = "n={} hex={x} c={c} s={s} b={b} {{ok}}\n";
 
@@ -28,3 +28,4 @@ fn main() -> i32 {
        buf5[0] == ('n' as u8) and buf5[2] == ('2' as u8) { return 0; }
     return 1;
 }
+
diff --git a/fec/tests/format/ok_prop.fe b/fec/tests/format/okprop.fe
similarity index 84%
rename from fec/tests/format/ok_prop.fe
rename to fec/tests/format/okprop.fe
index 49a0051..09bd3b0 100644
--- a/fec/tests/format/ok_prop.fe
+++ b/fec/tests/format/okprop.fe
@@ -1,5 +1,6 @@
-unit ok_prop;
+unit okprop;
 
 pub fn propagate(w: io.Writer) -> !void {
     try @fprint(w, "a{}b", 1);
 }
+
diff --git a/fec/tests/format/ok_try_f.fe b/fec/tests/format/oktryf.fe
similarity index 91%
rename from fec/tests/format/ok_try_f.fe
rename to fec/tests/format/oktryf.fe
index 5429146..9dbb866 100644
--- a/fec/tests/format/ok_try_f.fe
+++ b/fec/tests/format/oktryf.fe
@@ -1,4 +1,4 @@
-unit ok_try_f;
+unit oktryf;
 
 fn main() -> !void {
     var raw: [4]u8 = [0, 0, 0, 0];
@@ -6,3 +6,4 @@ fn main() -> !void {
     let w: io.Writer = io.null_writer();
     try @fprint(w, "ok");
 }
+
diff --git a/fec/tests/optional/badcatch.fe b/fec/tests/optional/badcatc.fe
similarity index 92%
rename from fec/tests/optional/badcatch.fe
rename to fec/tests/optional/badcatc.fe
index 97ed75c..01966ee 100644
--- a/fec/tests/optional/badcatch.fe
+++ b/fec/tests/optional/badcatc.fe
@@ -1,5 +1,5 @@
 // ERROR:13:catch
-unit badcatch;
+unit badcatc;
 
 error E {
     Bad = 1,
@@ -15,3 +15,4 @@ fn bad() -> i32 {
     };
     return v;
 }
+
diff --git a/fec/tests/optional/baddef.fe b/fec/tests/optional/baddefi.fe
similarity index 89%
rename from fec/tests/optional/baddef.fe
rename to fec/tests/optional/baddefi.fe
index 2ff2b0f..2ce9671 100644
--- a/fec/tests/optional/baddef.fe
+++ b/fec/tests/optional/baddefi.fe
@@ -1,5 +1,5 @@
 // ERROR:13:type
-unit baddef;
+unit baddefi;
 
 error E {
     Bad = 1,
@@ -12,3 +12,5 @@ fn leaf() -> E!i32 {
 fn bad() -> i32 {
     return leaf() catch false;
 }
+
+
diff --git a/fec/tests/optional/badercod.fe b/fec/tests/optional/badecod.fe
similarity index 80%
rename from fec/tests/optional/badercod.fe
rename to fec/tests/optional/badecod.fe
index ad5b34c..9f4e355 100644
--- a/fec/tests/optional/badercod.fe
+++ b/fec/tests/optional/badecod.fe
@@ -1,7 +1,8 @@
 // ERROR:6:duplicate
-unit badercod;
+unit badecod;
 
 error E {
     One = 1,
     Two = 1,
 }
+
diff --git a/fec/tests/optional/badernam.fe b/fec/tests/optional/badenam.fe
similarity index 80%
rename from fec/tests/optional/badernam.fe
rename to fec/tests/optional/badenam.fe
index 661e8c0..dc24789 100644
--- a/fec/tests/optional/badernam.fe
+++ b/fec/tests/optional/badenam.fe
@@ -1,7 +1,8 @@
 // ERROR:6:duplicate
-unit badernam;
+unit badenam;
 
 error E {
     One = 1,
     One = 2,
 }
+
diff --git a/fec/tests/optional/badetype.fe b/fec/tests/optional/badetyp.fe
similarity index 90%
rename from fec/tests/optional/badetype.fe
rename to fec/tests/optional/badetyp.fe
index af5bf39..d847230 100644
--- a/fec/tests/optional/badetype.fe
+++ b/fec/tests/optional/badetyp.fe
@@ -1,5 +1,5 @@
 // ERROR:17:error
-unit badetype;
+unit badetyp;
 
 error A {
     Bad = 1,
@@ -16,3 +16,5 @@ fn leaf() -> A!i32 {
 fn bad() -> B!i32 {
     return try leaf();
 }
+
+
diff --git a/fec/tests/optional/baddir.fe b/fec/tests/optional/badidir.fe
similarity index 87%
rename from fec/tests/optional/baddir.fe
rename to fec/tests/optional/badidir.fe
index 46e0715..6d4efde 100644
--- a/fec/tests/optional/baddir.fe
+++ b/fec/tests/optional/badidir.fe
@@ -1,5 +1,5 @@
 // ERROR:9:optional
-unit baddir;
+unit badidir;
 
 struct Node {
     value: i32,
@@ -8,3 +8,4 @@ struct Node {
 fn bad(p: ?^Node) -> i32 {
     return p.^.value;
 }
+
diff --git a/fec/tests/optional/badnull.fe b/fec/tests/optional/badnullv.fe
similarity index 76%
rename from fec/tests/optional/badnull.fe
rename to fec/tests/optional/badnullv.fe
index 4ed896b..d2ffae9 100644
--- a/fec/tests/optional/badnull.fe
+++ b/fec/tests/optional/badnullv.fe
@@ -1,6 +1,8 @@
 // ERROR:5:null
-unit badnull;
+unit badnullv;
 
 fn bad() -> void {
     let p = null;
 }
+
+
diff --git a/fec/tests/optional/badoref.fe b/fec/tests/optional/badorefv.fe
similarity index 76%
rename from fec/tests/optional/badoref.fe
rename to fec/tests/optional/badorefv.fe
index 641206e..150e1c6 100644
--- a/fec/tests/optional/badoref.fe
+++ b/fec/tests/optional/badorefv.fe
@@ -1,6 +1,8 @@
 // ERROR:5:reference
-unit badoref;
+unit badorefv;
 
 struct Bad {
     value: ?&i32,
 }
+
+
diff --git a/fec/tests/optional/badorel.fe b/fec/tests/optional/badorlx.fe
similarity index 89%
rename from fec/tests/optional/badorel.fe
rename to fec/tests/optional/badorlx.fe
index 3a79145..56c3b6a 100644
--- a/fec/tests/optional/badorel.fe
+++ b/fec/tests/optional/badorlx.fe
@@ -1,5 +1,5 @@
 // ERROR:9:non-Copy
-unit badorel;
+unit badorlx;
 
 struct Node {
     next: ?^Node,
@@ -8,3 +8,5 @@ struct Node {
 fn bad(p: ^Node, fallback: ^Node) -> ^Node {
     return p.next orelse fallback;
 }
+
+
diff --git a/fec/tests/optional/badproj.fe b/fec/tests/optional/badprjv.fe
similarity index 88%
rename from fec/tests/optional/badproj.fe
rename to fec/tests/optional/badprjv.fe
index a7d987c..24525d2 100644
--- a/fec/tests/optional/badproj.fe
+++ b/fec/tests/optional/badprjv.fe
@@ -1,5 +1,5 @@
 // ERROR:9:mem.replace
-unit badproj;
+unit badprjv;
 
 struct Node {
     next: ?^Node,
@@ -9,3 +9,5 @@ fn bad(p: ^Node) -> void {
     let q = p.next;
     mem.destroy(p);
 }
+
+
diff --git a/fec/tests/optional/badqmark.fe b/fec/tests/optional/badqmkv.fe
similarity index 82%
rename from fec/tests/optional/badqmark.fe
rename to fec/tests/optional/badqmkv.fe
index 36cdc7b..183a5d2 100644
--- a/fec/tests/optional/badqmark.fe
+++ b/fec/tests/optional/badqmkv.fe
@@ -1,7 +1,9 @@
 // ERROR:6:optional
-unit badqmark;
+unit badqmkv;
 
 fn bad() -> i32 {
     let x: i32 = 1;
     return x.?;
 }
+
+
diff --git a/fec/tests/optional/badret.fe b/fec/tests/optional/badrett.fe
similarity index 88%
rename from fec/tests/optional/badret.fe
rename to fec/tests/optional/badrett.fe
index 84842e2..adab03a 100644
--- a/fec/tests/optional/badret.fe
+++ b/fec/tests/optional/badrett.fe
@@ -1,5 +1,5 @@
 // ERROR:13:error
-unit badret;
+unit badrett;
 
 error A {
     Bad = 1,
@@ -12,3 +12,4 @@ error B {
 fn bad() -> B!i32 {
     return A.Bad;
 }
+
diff --git a/fec/tests/optional/badsome.fe b/fec/tests/optional/badsomev.fe
similarity index 80%
rename from fec/tests/optional/badsome.fe
rename to fec/tests/optional/badsomev.fe
index f35a461..f12958c 100644
--- a/fec/tests/optional/badsome.fe
+++ b/fec/tests/optional/badsomev.fe
@@ -1,7 +1,9 @@
 // ERROR:5:Some
-unit badsome;
+unit badsomev;
 
 fn bad() -> i32 {
     let x = Some(1);
     return x;
 }
+
+
diff --git a/fec/tests/optional/badtry.fe b/fec/tests/optional/badtryx.fe
similarity index 88%
rename from fec/tests/optional/badtry.fe
rename to fec/tests/optional/badtryx.fe
index a41273e..bd5ee9b 100644
--- a/fec/tests/optional/badtry.fe
+++ b/fec/tests/optional/badtryx.fe
@@ -1,5 +1,5 @@
 // ERROR:13:try
-unit badtry;
+unit badtryx;
 
 error E {
     Bad = 1,
@@ -12,3 +12,5 @@ fn leaf() -> E!i32 {
 fn bad() -> i32 {
     return try leaf();
 }
+
+
diff --git a/fec/tests/optional/badzero.fe b/fec/tests/optional/badzero1.fe
similarity index 70%
rename from fec/tests/optional/badzero.fe
rename to fec/tests/optional/badzero1.fe
index da86afb..b51d040 100644
--- a/fec/tests/optional/badzero.fe
+++ b/fec/tests/optional/badzero1.fe
@@ -1,6 +1,8 @@
 // ERROR:5:0
-unit badzero;
+unit badzero1;
 
 error E {
     Zero = 0,
 }
+
+
diff --git a/fec/tests/optional/okcatch.fe b/fec/tests/optional/okcatc.fe
similarity index 92%
rename from fec/tests/optional/okcatch.fe
rename to fec/tests/optional/okcatc.fe
index 557fd12..13aa727 100644
--- a/fec/tests/optional/okcatch.fe
+++ b/fec/tests/optional/okcatc.fe
@@ -1,4 +1,4 @@
-unit okcatch;
+unit okcatc;
 
 error E {
     Bad = 1,
@@ -14,3 +14,4 @@ fn top() -> E!i32 {
     };
     return v;
 }
+
diff --git a/fec/tests/optional/okcatmov.fe b/fec/tests/optional/okcatmv.fe
similarity index 90%
rename from fec/tests/optional/okcatmov.fe
rename to fec/tests/optional/okcatmv.fe
index c2c7b37..9cdc393 100644
--- a/fec/tests/optional/okcatmov.fe
+++ b/fec/tests/optional/okcatmv.fe
@@ -1,4 +1,4 @@
-unit okcatmov;
+unit okcatmv;
 
 error E { Bad = 1, }
 struct Node { value: i32, }
@@ -6,3 +6,4 @@ struct Node { value: i32, }
 fn recover(result: E!^Node, fallback: ^Node) -> ^Node {
     return result catch fallback;
 }
+
diff --git a/fec/tests/optional/okcvoid.fe b/fec/tests/optional/okcvd.fe
similarity index 90%
rename from fec/tests/optional/okcvoid.fe
rename to fec/tests/optional/okcvd.fe
index 4c1c2ab..1fab046 100644
--- a/fec/tests/optional/okcvoid.fe
+++ b/fec/tests/optional/okcvd.fe
@@ -1,4 +1,4 @@
-unit okcvoid;
+unit okcvd;
 
 error E {
     Bad = 1,
@@ -13,3 +13,4 @@ fn top() -> void {
         return;
     };
 }
+
diff --git a/fec/tests/optional/okdeflt.fe b/fec/tests/optional/okdefl.fe
similarity index 89%
rename from fec/tests/optional/okdeflt.fe
rename to fec/tests/optional/okdefl.fe
index b62d66c..b5fa8a6 100644
--- a/fec/tests/optional/okdeflt.fe
+++ b/fec/tests/optional/okdefl.fe
@@ -1,4 +1,4 @@
-unit okdeflt;
+unit okdefl;
 
 error E {
     Bad = 1,
@@ -11,3 +11,4 @@ fn leaf() -> E!i32 {
 fn top() -> i32 {
     return leaf() catch 11;
 }
+
diff --git a/fec/tests/optional/okiflet.fe b/fec/tests/optional/okiflt.fe
similarity index 86%
rename from fec/tests/optional/okiflet.fe
rename to fec/tests/optional/okiflt.fe
index 3192c4b..7d9d14c 100644
--- a/fec/tests/optional/okiflet.fe
+++ b/fec/tests/optional/okiflt.fe
@@ -1,4 +1,4 @@
-unit okiflet;
+unit okiflt;
 
 fn value(p: ?i32) -> i32 {
     if let Some(v) = p {
@@ -6,3 +6,5 @@ fn value(p: ?i32) -> i32 {
     }
     return 0;
 }
+
+
diff --git a/fec/tests/optional/okmatch.fe b/fec/tests/optional/okmtch.fe
similarity index 88%
rename from fec/tests/optional/okmatch.fe
rename to fec/tests/optional/okmtch.fe
index 6335cff..6cfaa8d 100644
--- a/fec/tests/optional/okmatch.fe
+++ b/fec/tests/optional/okmtch.fe
@@ -1,4 +1,4 @@
-unit okmatch;
+unit okmtch;
 
 fn value(p: ?i32) -> i32 {
     match p {
@@ -6,3 +6,5 @@ fn value(p: ?i32) -> i32 {
         None => { return 0; }
     }
 }
+
+
diff --git a/fec/tests/optional/oknull.fe b/fec/tests/optional/oknull1.fe
similarity index 90%
rename from fec/tests/optional/oknull.fe
rename to fec/tests/optional/oknull1.fe
index c12a917..ce22d95 100644
--- a/fec/tests/optional/oknull.fe
+++ b/fec/tests/optional/oknull1.fe
@@ -1,4 +1,4 @@
-unit oknull;
+unit oknull1;
 
 struct Node { value: i32, }
 
@@ -8,3 +8,5 @@ fn test() -> bool {
     let p: ?^Node = null;
     return accepts(p);
 }
+
+
diff --git a/fec/tests/optional/okorelse.fe b/fec/tests/optional/okorel.fe
similarity index 77%
rename from fec/tests/optional/okorelse.fe
rename to fec/tests/optional/okorel.fe
index 9ff537e..f49a0f5 100644
--- a/fec/tests/optional/okorelse.fe
+++ b/fec/tests/optional/okorel.fe
@@ -1,5 +1,6 @@
-unit okorelse;
+unit okorel;
 
 fn value(p: ?i32) -> i32 {
     return p orelse 9;
 }
+
diff --git a/fec/tests/optional/okproj.fe b/fec/tests/optional/okproj1.fe
similarity index 84%
rename from fec/tests/optional/okproj.fe
rename to fec/tests/optional/okproj1.fe
index f54768a..4bcca85 100644
--- a/fec/tests/optional/okproj.fe
+++ b/fec/tests/optional/okproj1.fe
@@ -1,4 +1,4 @@
-unit okproj;
+unit okproj1;
 
 struct Node {
     value: i32,
@@ -7,3 +7,5 @@ struct Node {
 fn touch(p: ?&mut Node) -> void {
     p.?.value = 7;
 }
+
+
diff --git a/fec/tests/optional/okpatvw.fe b/fec/tests/optional/okptvw.fe
similarity index 93%
rename from fec/tests/optional/okpatvw.fe
rename to fec/tests/optional/okptvw.fe
index 5797b46..a046b5e 100644
--- a/fec/tests/optional/okpatvw.fe
+++ b/fec/tests/optional/okptvw.fe
@@ -1,4 +1,4 @@
-unit okpatvw;
+unit okptvw;
 
 struct Node { value: i32, }
 
@@ -10,3 +10,5 @@ fn keep(p: ?^Node) -> void {
     let owned = mem.replace(&mut slot, null).?;
     mem.destroy(owned);
 }
+
+
diff --git a/fec/tests/optional/okrepl.fe b/fec/tests/optional/okrepl2.fe
similarity index 90%
rename from fec/tests/optional/okrepl.fe
rename to fec/tests/optional/okrepl2.fe
index 2710132..1bab0bd 100644
--- a/fec/tests/optional/okrepl.fe
+++ b/fec/tests/optional/okrepl2.fe
@@ -1,4 +1,4 @@
-unit okrepl;
+unit okrepl2;
 
 struct Node {
     value: i32,
@@ -9,3 +9,5 @@ fn take(p: ?^Node) -> void {
     let n = mem.replace(&mut q, null).?;
     mem.destroy(n);
 }
+
+
diff --git a/fec/tests/optional/oktrdef.fe b/fec/tests/optional/oktrd2.fe
similarity index 90%
rename from fec/tests/optional/oktrdef.fe
rename to fec/tests/optional/oktrd2.fe
index 1b0831c..f0361df 100644
--- a/fec/tests/optional/oktrdef.fe
+++ b/fec/tests/optional/oktrd2.fe
@@ -1,4 +1,4 @@
-unit oktrdef;
+unit oktrd2;
 
 error E {
     Bad = 1,
@@ -12,3 +12,5 @@ fn top() -> E!i32 {
     defer { let x: i32 = 1; }
     return try leaf();
 }
+
+
diff --git a/fec/tests/optional/oktry.fe b/fec/tests/optional/oktry2.fe
similarity index 90%
rename from fec/tests/optional/oktry.fe
rename to fec/tests/optional/oktry2.fe
index f0066db..6140223 100644
--- a/fec/tests/optional/oktry.fe
+++ b/fec/tests/optional/oktry2.fe
@@ -1,4 +1,4 @@
-unit oktry;
+unit oktry2;
 
 error E {
     Bad = 1,
@@ -12,3 +12,5 @@ fn leaf(ok: bool) -> E!i32 {
 fn top() -> E!i32 {
     return try leaf(true);
 }
+
+
diff --git a/fec/tests/own/badarg.fe b/fec/tests/own/badargu.fe
similarity index 90%
rename from fec/tests/own/badarg.fe
rename to fec/tests/own/badargu.fe
index 7e50114..55d092d 100644
--- a/fec/tests/own/badarg.fe
+++ b/fec/tests/own/badargu.fe
@@ -1,5 +1,5 @@
 // ERROR:8:derived from a parameter
-unit badarg;
+unit badargu;
 
 struct Box {
     value: i32,
@@ -8,3 +8,5 @@ struct Box {
         return other;
     }
 }
+
+
diff --git a/fec/tests/own/badbrmov.fe b/fec/tests/own/badbrmv.fe
similarity index 89%
rename from fec/tests/own/badbrmov.fe
rename to fec/tests/own/badbrmv.fe
index f07825d..d0fc104 100644
--- a/fec/tests/own/badbrmov.fe
+++ b/fec/tests/own/badbrmv.fe
@@ -1,5 +1,5 @@
 // ERROR:8:move
-unit badbrmov;
+unit badbrmv;
 
 fn bad(p: ^i32, consume: bool) -> void {
     if consume {
@@ -7,3 +7,4 @@ fn bad(p: ^i32, consume: bool) -> void {
     }
     mem.destroy(p);
 }
+
diff --git a/fec/tests/own/bad_clos.fe b/fec/tests/own/badclos.fe
similarity index 94%
rename from fec/tests/own/bad_clos.fe
rename to fec/tests/own/badclos.fe
index 28ff3e4..447c0f6 100644
--- a/fec/tests/own/bad_clos.fe
+++ b/fec/tests/own/badclos.fe
@@ -1,4 +1,4 @@
-unit bad_clos;
+unit badclos;
 
 struct FileLike {
     handle: i32,
@@ -11,3 +11,4 @@ fn bad() -> !void {
     try file.close();
     file.close();
 }
+
diff --git a/fec/tests/own/bad_cond.fe b/fec/tests/own/badcond.fe
similarity index 89%
rename from fec/tests/own/bad_cond.fe
rename to fec/tests/own/badcond.fe
index f46cfe4..2f5916d 100644
--- a/fec/tests/own/bad_cond.fe
+++ b/fec/tests/own/badcond.fe
@@ -1,4 +1,4 @@
-unit bad_cond;
+unit badcond;
 
 fn take(p: ^i32) -> void { mem.destroy(p); }
 
@@ -6,3 +6,4 @@ fn bad(p: ^i32, flag: bool) -> void {
     if flag { take(p); }
     p.^ = 3;
 }
+
diff --git a/fec/tests/own/bad_dbl.fe b/fec/tests/own/baddbl.fe
similarity index 83%
rename from fec/tests/own/bad_dbl.fe
rename to fec/tests/own/baddbl.fe
index a990673..84f3912 100644
--- a/fec/tests/own/bad_dbl.fe
+++ b/fec/tests/own/baddbl.fe
@@ -1,6 +1,7 @@
-unit bad_dbl;
+unit baddbl;
 
 fn bad(p: ^i32) -> void {
     mem.destroy(p);
     mem.destroy(p);
 }
+
diff --git a/fec/tests/own/baddefer.fe b/fec/tests/own/baddefr.fe
similarity index 92%
rename from fec/tests/own/baddefer.fe
rename to fec/tests/own/baddefr.fe
index faf7839..47a991f 100644
--- a/fec/tests/own/baddefer.fe
+++ b/fec/tests/own/baddefr.fe
@@ -1,5 +1,5 @@
 // ERROR:10:borrow
-unit baddefer;
+unit baddefr;
 
 fn read(r: &i32) -> i32 { return r.^; }
 
@@ -10,3 +10,4 @@ fn bad() -> i32 {
     x = 1;
     return x;
 }
+
diff --git a/fec/tests/own/bad_dest.fe b/fec/tests/own/baddest.fe
similarity index 76%
rename from fec/tests/own/bad_dest.fe
rename to fec/tests/own/baddest.fe
index 8cedd19..11d462b 100644
--- a/fec/tests/own/bad_dest.fe
+++ b/fec/tests/own/baddest.fe
@@ -1,5 +1,6 @@
-unit bad_dest;
+unit baddest;
 
 fn bad(x: i32) -> void {
     mem.destroy(x);
 }
+
diff --git a/fec/tests/own/bad_drop.fe b/fec/tests/own/baddrop.fe
similarity index 90%
rename from fec/tests/own/bad_drop.fe
rename to fec/tests/own/baddrop.fe
index ad9e9cc..5a4e74d 100644
--- a/fec/tests/own/bad_drop.fe
+++ b/fec/tests/own/baddrop.fe
@@ -1,4 +1,4 @@
-unit bad_drop;
+unit baddrop;
 
 struct Box {
     value: i32,
@@ -9,3 +9,4 @@ fn bad() -> void {
     var b: Box = Box{ value: 1 };
     b.drop();
 }
+
diff --git a/fec/tests/own/badfld.fe b/fec/tests/own/badfmem.fe
similarity index 78%
rename from fec/tests/own/badfld.fe
rename to fec/tests/own/badfmem.fe
index d4090ff..71eec2c 100644
--- a/fec/tests/own/badfld.fe
+++ b/fec/tests/own/badfmem.fe
@@ -1,6 +1,7 @@
 // ERROR:5:reference
-unit badfld;
+unit badfmem;
 
 struct Bad {
     value: &i32,
 }
+
diff --git a/fec/tests/own/badglob.fe b/fec/tests/own/badglobx.fe
similarity index 84%
rename from fec/tests/own/badglob.fe
rename to fec/tests/own/badglobx.fe
index 41a107c..3afdcc9 100644
--- a/fec/tests/own/badglob.fe
+++ b/fec/tests/own/badglobx.fe
@@ -1,5 +1,5 @@
 // ERROR:7:global
-unit badglob;
+unit badglobx;
 
 var VALUE: i32 = 0;
 
@@ -7,3 +7,5 @@ fn bad() -> i32 {
     let r = &VALUE;
     return r.^;
 }
+
+
diff --git a/fec/tests/own/badbinit.fe b/fec/tests/own/badinit.fe
similarity index 90%
rename from fec/tests/own/badbinit.fe
rename to fec/tests/own/badinit.fe
index b6eb632..049641b 100644
--- a/fec/tests/own/badbinit.fe
+++ b/fec/tests/own/badinit.fe
@@ -1,5 +1,5 @@
 // ERROR:9:initialized
-unit badbinit;
+unit badinit;
 
 fn bad(assign: bool) -> i32 {
     var value: i32;
@@ -8,3 +8,4 @@ fn bad(assign: bool) -> i32 {
     }
     return value;
 }
+
diff --git a/fec/tests/own/badinv.fe b/fec/tests/own/badinvr.fe
similarity index 88%
rename from fec/tests/own/badinv.fe
rename to fec/tests/own/badinvr.fe
index 88f483c..3338eed 100644
--- a/fec/tests/own/badinv.fe
+++ b/fec/tests/own/badinvr.fe
@@ -1,5 +1,5 @@
 // ERROR:6:borrow
-unit badinv;
+unit badinvr;
 
 fn bad(p: ^i32, q: ^i32) -> void {
     let r = &p;
@@ -7,3 +7,5 @@ fn bad(p: ^i32, q: ^i32) -> void {
     let keep = r;
     mem.destroy(p);
 }
+
+
diff --git a/fec/tests/own/bad_loop.fe b/fec/tests/own/badlop1.fe
similarity index 88%
rename from fec/tests/own/bad_loop.fe
rename to fec/tests/own/badlop1.fe
index c7fd822..7dc06ff 100644
--- a/fec/tests/own/bad_loop.fe
+++ b/fec/tests/own/badlop1.fe
@@ -1,7 +1,8 @@
-unit bad_loop;
+unit badlop1;
 
 fn take(p: ^i32) -> void { mem.destroy(p); }
 
 fn bad(p: ^i32, again: bool) -> void {
     while again { take(p); }
 }
+
diff --git a/fec/tests/own/badloop.fe b/fec/tests/own/badlp2.fe
similarity index 90%
rename from fec/tests/own/badloop.fe
rename to fec/tests/own/badlp2.fe
index 1cb6a4f..0d403b6 100644
--- a/fec/tests/own/badloop.fe
+++ b/fec/tests/own/badlp2.fe
@@ -1,5 +1,5 @@
 // ERROR:6:move
-unit badloop;
+unit badlp2;
 
 fn bad(p: ^i32, again: bool) -> void {
     while again {
@@ -7,3 +7,4 @@ fn bad(p: ^i32, again: bool) -> void {
     }
     mem.destroy(p);
 }
+
diff --git a/fec/tests/own/badmut.fe b/fec/tests/own/badmutv.fe
similarity index 87%
rename from fec/tests/own/badmut.fe
rename to fec/tests/own/badmutv.fe
index 90aab1f..95741c0 100644
--- a/fec/tests/own/badmut.fe
+++ b/fec/tests/own/badmutv.fe
@@ -1,5 +1,5 @@
 // ERROR:7:borrow
-unit badmut;
+unit badmutv;
 
 fn bad() -> i32 {
     var x: i32 = 0;
@@ -8,3 +8,5 @@ fn bad() -> i32 {
     r.^ = 2;
     return x;
 }
+
+
diff --git a/fec/tests/own/badmut2.fe b/fec/tests/own/badmutx.fe
similarity index 89%
rename from fec/tests/own/badmut2.fe
rename to fec/tests/own/badmutx.fe
index 790e251..34fa6e9 100644
--- a/fec/tests/own/badmut2.fe
+++ b/fec/tests/own/badmutx.fe
@@ -1,5 +1,5 @@
 // ERROR:7:borrow
-unit badmut2;
+unit badmutx;
 
 fn bad() -> i32 {
     var x: i32 = 0;
@@ -9,3 +9,5 @@ fn bad() -> i32 {
     b.^ = 2;
     return x;
 }
+
+
diff --git a/fec/tests/own/bad_move.fe b/fec/tests/own/badmv1.fe
similarity index 87%
rename from fec/tests/own/bad_move.fe
rename to fec/tests/own/badmv1.fe
index 15d25fb..8f53bcc 100644
--- a/fec/tests/own/bad_move.fe
+++ b/fec/tests/own/badmv1.fe
@@ -1,4 +1,4 @@
-unit bad_move;
+unit badmv1;
 
 fn take(p: ^i32) -> void { mem.destroy(p); }
 
@@ -6,3 +6,4 @@ fn twice(p: ^i32) -> void {
     take(p);
     take(p);
 }
+
diff --git a/fec/tests/own/badmove.fe b/fec/tests/own/badmv2.fe
similarity index 90%
rename from fec/tests/own/badmove.fe
rename to fec/tests/own/badmv2.fe
index e746062..da71598 100644
--- a/fec/tests/own/badmove.fe
+++ b/fec/tests/own/badmv2.fe
@@ -1,5 +1,5 @@
 // ERROR:8:borrow
-unit badmove;
+unit badmv2;
 
 fn take(p: ^i32) -> void { mem.destroy(p); }
 
@@ -8,3 +8,4 @@ fn bad(p: ^i32) -> void {
     take(p);
     let q = r;
 }
+
diff --git a/fec/tests/own/bad_proj.fe b/fec/tests/own/badproj.fe
similarity index 88%
rename from fec/tests/own/bad_proj.fe
rename to fec/tests/own/badproj.fe
index 0c50987..e756adf 100644
--- a/fec/tests/own/bad_proj.fe
+++ b/fec/tests/own/badproj.fe
@@ -1,4 +1,4 @@
-unit bad_proj;
+unit badproj;
 
 struct Holder { p: ^i32 }
 fn take(p: ^i32) -> void { mem.destroy(p); }
@@ -6,3 +6,4 @@ fn take(p: ^i32) -> void { mem.destroy(p); }
 fn bad(h: Holder) -> void {
     take(h.p);
 }
+
diff --git a/fec/tests/own/badptr.fe b/fec/tests/own/badptrx.fe
similarity index 79%
rename from fec/tests/own/badptr.fe
rename to fec/tests/own/badptrx.fe
index 36e9490..1426db3 100644
--- a/fec/tests/own/badptr.fe
+++ b/fec/tests/own/badptrx.fe
@@ -1,6 +1,8 @@
 // ERROR:4:reference
-unit badptr;
+unit badptrx;
 
 fn bad(p: *&i32) -> void {
     return;
 }
+
+
diff --git a/fec/tests/own/badret.fe b/fec/tests/own/badretv.fe
similarity index 83%
rename from fec/tests/own/badret.fe
rename to fec/tests/own/badretv.fe
index 5a9a777..774a760 100644
--- a/fec/tests/own/badret.fe
+++ b/fec/tests/own/badretv.fe
@@ -1,7 +1,8 @@
 // ERROR:6:reference
-unit badret;
+unit badretv;
 
 fn bad() -> &i32 {
     let x: i32 = 1;
     return &x;
 }
+
diff --git a/fec/tests/own/badrfld.fe b/fec/tests/own/badrfie.fe
similarity index 90%
rename from fec/tests/own/badrfld.fe
rename to fec/tests/own/badrfie.fe
index 65cb8b0..fd366aa 100644
--- a/fec/tests/own/badrfld.fe
+++ b/fec/tests/own/badrfie.fe
@@ -1,5 +1,5 @@
 // ERROR:9:borrow
-unit badrfld;
+unit badrfie;
 
 struct Pair { a: i32, b: i32, }
 
@@ -9,3 +9,5 @@ fn bad() -> void {
     p.b = 3;
     left.^ = 4;
 }
+
+
diff --git a/fec/tests/own/badridx.fe b/fec/tests/own/badri2.fe
similarity index 90%
rename from fec/tests/own/badridx.fe
rename to fec/tests/own/badri2.fe
index d7597c5..a6987b3 100644
--- a/fec/tests/own/badridx.fe
+++ b/fec/tests/own/badri2.fe
@@ -1,5 +1,5 @@
 // ERROR:7:borrow
-unit badridx;
+unit badri2;
 
 fn bad() -> void {
     var xs: [2]i32 = [1, 2];
@@ -8,3 +8,5 @@ fn bad() -> void {
     a.^ = 3;
     b.^ = 4;
 }
+
+
diff --git a/fec/tests/own/badscop.fe b/fec/tests/own/badscp1.fe
similarity index 92%
rename from fec/tests/own/badscop.fe
rename to fec/tests/own/badscp1.fe
index 3bbeded..a7893fe 100644
--- a/fec/tests/own/badscop.fe
+++ b/fec/tests/own/badscp1.fe
@@ -1,5 +1,5 @@
 // ERROR:9:reference
-unit badscop;
+unit badscp1;
 
 fn bad(cond: bool) -> i32 {
     let outer: i32 = 0;
@@ -10,3 +10,5 @@ fn bad(cond: bool) -> i32 {
     }
     return r.^;
 }
+
+
diff --git a/fec/tests/own/badself.fe b/fec/tests/own/badselfw.fe
similarity index 87%
rename from fec/tests/own/badself.fe
rename to fec/tests/own/badselfw.fe
index fe80c84..2e2795d 100644
--- a/fec/tests/own/badself.fe
+++ b/fec/tests/own/badselfw.fe
@@ -1,5 +1,5 @@
 // ERROR:8:self
-unit badself;
+unit badselfw;
 
 struct Box {
     value: i32,
@@ -8,3 +8,5 @@ struct Box {
         return &self.value;
     }
 }
+
+
diff --git a/fec/tests/own/badshwr.fe b/fec/tests/own/badshw1.fe
similarity index 90%
rename from fec/tests/own/badshwr.fe
rename to fec/tests/own/badshw1.fe
index 015d14f..c1c2d11 100644
--- a/fec/tests/own/badshwr.fe
+++ b/fec/tests/own/badshw1.fe
@@ -1,5 +1,5 @@
 // ERROR:9:borrow
-unit badshwr;
+unit badshw1;
 
 fn read(r: &i32) -> i32 { return r.^; }
 
@@ -9,3 +9,5 @@ fn bad() -> i32 {
     x = 1;
     return read(r);
 }
+
+
diff --git a/fec/tests/own/badtwo.fe b/fec/tests/own/badtwo2.fe
similarity index 82%
rename from fec/tests/own/badtwo.fe
rename to fec/tests/own/badtwo2.fe
index dcdfa0e..431f7e9 100644
--- a/fec/tests/own/badtwo.fe
+++ b/fec/tests/own/badtwo2.fe
@@ -1,6 +1,8 @@
 // ERROR:5:reference
-unit badtwo;
+unit badtwo2;
 
 fn choose(a: &i32, b: &i32) -> &i32 {
     return a;
 }
+
+
diff --git a/fec/tests/own/badup.fe b/fec/tests/own/badup1.fe
similarity index 89%
rename from fec/tests/own/badup.fe
rename to fec/tests/own/badup1.fe
index 34f2b7e..a7b363c 100644
--- a/fec/tests/own/badup.fe
+++ b/fec/tests/own/badup1.fe
@@ -1,5 +1,5 @@
 // ERROR:8:mut
-unit badup;
+unit badup1;
 
 struct Box {
     value: i32,
@@ -8,3 +8,5 @@ struct Box {
         return &mut self.value;
     }
 }
+
+
diff --git a/fec/tests/own/badweak.fe b/fec/tests/own/badweak2.fe
similarity index 87%
rename from fec/tests/own/badweak.fe
rename to fec/tests/own/badweak2.fe
index 8da6bc8..645e3fa 100644
--- a/fec/tests/own/badweak.fe
+++ b/fec/tests/own/badweak2.fe
@@ -1,5 +1,5 @@
 // ERROR:7:mut
-unit badweak;
+unit badweak2;
 
 fn bad() -> void {
     var x: i32 = 0;
@@ -7,3 +7,5 @@ fn bad() -> void {
     let s: &i32 = m;
     let v = s.^;
 }
+
+
diff --git a/fec/tests/own/okbranch.fe b/fec/tests/own/okbrch.fe
similarity index 93%
rename from fec/tests/own/okbranch.fe
rename to fec/tests/own/okbrch.fe
index f6964b8..e68873e 100644
--- a/fec/tests/own/okbranch.fe
+++ b/fec/tests/own/okbrch.fe
@@ -1,4 +1,4 @@
-unit okbranch;
+unit okbrch;
 
 fn read(r: &i32) -> i32 { return r.^; }
 
@@ -13,3 +13,5 @@ fn test(cond: bool) -> i32 {
     x += 1;
     return x;
 }
+
+
diff --git a/fec/tests/own/ok_defer.fe b/fec/tests/own/okdefer1.fe
similarity index 80%
rename from fec/tests/own/ok_defer.fe
rename to fec/tests/own/okdefer1.fe
index e4e2fef..518a806 100644
--- a/fec/tests/own/ok_defer.fe
+++ b/fec/tests/own/okdefer1.fe
@@ -1,5 +1,6 @@
-unit ok_defer;
+unit okdefer1;
 
 pub fn cleanup(p: ^i32) -> void {
     defer { mem.destroy(p); }
 }
+
diff --git a/fec/tests/own/okdefer.fe b/fec/tests/own/okdefer2.fe
similarity index 92%
rename from fec/tests/own/okdefer.fe
rename to fec/tests/own/okdefer2.fe
index 1556b46..5185a16 100644
--- a/fec/tests/own/okdefer.fe
+++ b/fec/tests/own/okdefer2.fe
@@ -1,4 +1,4 @@
-unit okdefer;
+unit okdefer2;
 
 fn read(r: &i32) -> i32 { return r.^; }
 
@@ -11,3 +11,4 @@ fn test() -> i32 {
     x += 1;
     return x;
 }
+
diff --git a/fec/tests/own/okglobcp.fe b/fec/tests/own/okglobc.fe
similarity index 89%
rename from fec/tests/own/okglobcp.fe
rename to fec/tests/own/okglobc.fe
index e0c3e95..6760865 100644
--- a/fec/tests/own/okglobcp.fe
+++ b/fec/tests/own/okglobc.fe
@@ -1,4 +1,4 @@
-unit okglobcp;
+unit okglobc;
 
 var VALUE: i32 = 7;
 
@@ -8,3 +8,4 @@ fn test() -> i32 {
     let local = VALUE;
     return read(&local);
 }
+
diff --git a/fec/tests/own/oklast.fe b/fec/tests/own/oklast1.fe
similarity index 86%
rename from fec/tests/own/oklast.fe
rename to fec/tests/own/oklast1.fe
index 2e1e9f1..dfb7897 100644
--- a/fec/tests/own/oklast.fe
+++ b/fec/tests/own/oklast1.fe
@@ -1,4 +1,4 @@
-unit oklast;
+unit oklast1;
 
 fn test() -> i32 {
     var x: i32 = 0;
@@ -7,3 +7,5 @@ fn test() -> i32 {
     x += 1;
     return x;
 }
+
+
diff --git a/fec/tests/own/ok_owned.fe b/fec/tests/own/okowned.fe
similarity index 91%
rename from fec/tests/own/ok_owned.fe
rename to fec/tests/own/okowned.fe
index 2881628..96581e5 100644
--- a/fec/tests/own/ok_owned.fe
+++ b/fec/tests/own/okowned.fe
@@ -1,4 +1,4 @@
-unit ok_owned;
+unit okowned;
 
 fn main() -> !void {
     var p: ^i32 = try mem.create(0);
@@ -7,3 +7,4 @@ fn main() -> !void {
     let value: i32 = p.^;
     defer { mem.destroy(p); }
 }
+
diff --git a/fec/tests/own/okr8free.fe b/fec/tests/own/okr8fr.fe
similarity index 92%
rename from fec/tests/own/okr8free.fe
rename to fec/tests/own/okr8fr.fe
index 0ae189e..49c2ac8 100644
--- a/fec/tests/own/okr8free.fe
+++ b/fec/tests/own/okr8fr.fe
@@ -1,4 +1,4 @@
-unit okr8free;
+unit okr8fr;
 
 fn head(s: []u8) -> &u8 {
     return &s[0];
@@ -11,3 +11,5 @@ fn test() -> u8 {
     a[0] = 7 as u8;
     return v;
 }
+
+
diff --git a/fec/tests/own/okr8join.fe b/fec/tests/own/okr8jn.fe
similarity index 94%
rename from fec/tests/own/okr8join.fe
rename to fec/tests/own/okr8jn.fe
index b2e67dd..9395a1e 100644
--- a/fec/tests/own/okr8join.fe
+++ b/fec/tests/own/okr8jn.fe
@@ -1,4 +1,4 @@
-unit okr8join;
+unit okr8jn;
 
 fn select(s: str, from_param: bool) -> str {
     if from_param { return s; }
@@ -12,3 +12,5 @@ fn test() -> u8 {
     bytes[0] = 8 as u8;
     return value;
 }
+
+
diff --git a/fec/tests/own/okr8meth.fe b/fec/tests/own/okr8mt.fe
similarity index 93%
rename from fec/tests/own/okr8meth.fe
rename to fec/tests/own/okr8mt.fe
index 8f49258..271c723 100644
--- a/fec/tests/own/okr8meth.fe
+++ b/fec/tests/own/okr8mt.fe
@@ -1,4 +1,4 @@
-unit okr8meth;
+unit okr8mt;
 
 struct Box {
     value: i32,
@@ -15,3 +15,5 @@ fn test() -> i32 {
     b.value = 5;
     return v;
 }
+
+
diff --git a/fec/tests/own/okr8stat.fe b/fec/tests/own/okr8st.fe
similarity index 73%
rename from fec/tests/own/okr8stat.fe
rename to fec/tests/own/okr8st.fe
index 5db67d4..6158944 100644
--- a/fec/tests/own/okr8stat.fe
+++ b/fec/tests/own/okr8st.fe
@@ -1,5 +1,7 @@
-unit okr8stat;
+unit okr8st;
 
 fn name() -> str {
     return "main";
 }
+
+
diff --git a/fec/tests/own/okrebor.fe b/fec/tests/own/okrbor1.fe
similarity index 90%
rename from fec/tests/own/okrebor.fe
rename to fec/tests/own/okrbor1.fe
index b92ebf8..0569f27 100644
--- a/fec/tests/own/okrebor.fe
+++ b/fec/tests/own/okrbor1.fe
@@ -1,4 +1,4 @@
-unit okrebor;
+unit okrbor1;
 
 fn read(r: &i32) -> i32 { return r.^; }
 
@@ -9,3 +9,5 @@ fn test() -> i32 {
     r.^ = v + 1;
     return r.^;
 }
+
+
diff --git a/fec/tests/own/okrtlast.fe b/fec/tests/own/okrtls.fe
similarity index 91%
rename from fec/tests/own/okrtlast.fe
rename to fec/tests/own/okrtls.fe
index bd87c4e..e917db9 100644
--- a/fec/tests/own/okrtlast.fe
+++ b/fec/tests/own/okrtls.fe
@@ -1,4 +1,4 @@
-unit okrtlast;
+unit okrtls;
 
 struct Pair { a: i32, b: i32, }
 
@@ -9,3 +9,5 @@ fn test() -> i32 {
     p.b = 4;
     return p.a + p.b;
 }
+
+
diff --git a/fec/tests/own/okshare.fe b/fec/tests/own/okshar1.fe
similarity index 90%
rename from fec/tests/own/okshare.fe
rename to fec/tests/own/okshar1.fe
index 1740394..a82bdd0 100644
--- a/fec/tests/own/okshare.fe
+++ b/fec/tests/own/okshar1.fe
@@ -1,4 +1,4 @@
-unit okshare;
+unit okshar1;
 
 fn add(a: &i32, b: &i32) -> i32 {
     return a.^ + b.^;
@@ -10,3 +10,5 @@ fn test() -> i32 {
     let b = &x;
     return add(a, b);
 }
+
+
diff --git a/fec/tests/own/okslreb.fe b/fec/tests/own/okslre1.fe
similarity index 91%
rename from fec/tests/own/okslreb.fe
rename to fec/tests/own/okslre1.fe
index 7b8a6a7..1f3aef6 100644
--- a/fec/tests/own/okslreb.fe
+++ b/fec/tests/own/okslre1.fe
@@ -1,4 +1,4 @@
-unit okslreb;
+unit okslre1;
 
 fn first(s: []u8) -> u8 { return s[0]; }
 
@@ -9,3 +9,5 @@ fn test() -> u8 {
     s[0] = 9 as u8;
     return v;
 }
+
+
diff --git a/fec/tests/own/okstatic.fe b/fec/tests/own/okstat1.fe
similarity index 86%
rename from fec/tests/own/okstatic.fe
rename to fec/tests/own/okstat1.fe
index ae2487e..e231e3c 100644
--- a/fec/tests/own/okstatic.fe
+++ b/fec/tests/own/okstat1.fe
@@ -1,4 +1,4 @@
-unit okstatic;
+unit okstat1;
 
 static VALUE: i32 = 7;
 
@@ -9,3 +9,5 @@ fn get() -> &i32 {
 fn test() -> i32 {
     return get().^;
 }
+
+
diff --git a/fec/tests/own/oktemp.fe b/fec/tests/own/oktemp1.fe
similarity index 89%
rename from fec/tests/own/oktemp.fe
rename to fec/tests/own/oktemp1.fe
index d88b1f7..c382b89 100644
--- a/fec/tests/own/oktemp.fe
+++ b/fec/tests/own/oktemp1.fe
@@ -1,4 +1,4 @@
-unit oktemp;
+unit oktemp1;
 
 fn read(r: &i32) -> i32 { return r.^; }
 
@@ -8,3 +8,5 @@ fn test() -> i32 {
     x += 1;
     return v + x;
 }
+
+
diff --git a/fec/tests/own/oktrim.fe b/fec/tests/own/oktrim1.fe
similarity index 78%
rename from fec/tests/own/oktrim.fe
rename to fec/tests/own/oktrim1.fe
index cf416ac..f1e403c 100644
--- a/fec/tests/own/oktrim.fe
+++ b/fec/tests/own/oktrim1.fe
@@ -1,5 +1,7 @@
-unit oktrim;
+unit oktrim1;
 
 fn trimmed(line: str) -> str {
     return line.trim();
 }
+
+
diff --git a/fec/tests/own/okwcall.fe b/fec/tests/own/okwcal1.fe
similarity index 91%
rename from fec/tests/own/okwcall.fe
rename to fec/tests/own/okwcal1.fe
index a53efe2..a81f447 100644
--- a/fec/tests/own/okwcall.fe
+++ b/fec/tests/own/okwcal1.fe
@@ -1,4 +1,4 @@
-unit okwcall;
+unit okwcal1;
 
 fn read(r: &i32) -> i32 { return r.^; }
 
@@ -9,3 +9,5 @@ fn test() -> i32 {
     m.^ = value + 1;
     return m.^;
 }
+
+
diff --git a/fec/tests/types/bad_ari.fe b/fec/tests/types/badarith.fe
similarity index 85%
rename from fec/tests/types/bad_ari.fe
rename to fec/tests/types/badarith.fe
index bdf4619..424e3cf 100644
--- a/fec/tests/types/bad_ari.fe
+++ b/fec/tests/types/badarith.fe
@@ -1,4 +1,4 @@
-unit bad_ari;
+unit badarith;
 
 fn add(a: i32, b: i32) -> i32 {
     return a + b;
@@ -7,3 +7,4 @@ fn add(a: i32, b: i32) -> i32 {
 fn main() -> i32 {
     return add(1);
 }
+
diff --git a/fec/tests/types/badarr.fe b/fec/tests/types/badarry.fe
similarity index 82%
rename from fec/tests/types/badarr.fe
rename to fec/tests/types/badarry.fe
index 11007cb..ad4072f 100644
--- a/fec/tests/types/badarr.fe
+++ b/fec/tests/types/badarry.fe
@@ -1,5 +1,6 @@
-unit badarr;
+unit badarry;
 fn main() -> i32 {
     let a: [2]i32 = [1, true, 3];
     return a[0];
 }
+
diff --git a/fec/tests/types/bad_asgn.fe b/fec/tests/types/badasgn.fe
similarity index 84%
rename from fec/tests/types/bad_asgn.fe
rename to fec/tests/types/badasgn.fe
index 3e921bc..eae96b2 100644
--- a/fec/tests/types/bad_asgn.fe
+++ b/fec/tests/types/badasgn.fe
@@ -1,7 +1,8 @@
-unit bad_asgn;
+unit badasgn;
 
 fn main() -> i32 {
     let value: i32 = 1;
     value = 2;
     return value;
 }
+
diff --git a/fec/tests/types/badchar.fe b/fec/tests/types/badbyte.fe
similarity index 79%
rename from fec/tests/types/badchar.fe
rename to fec/tests/types/badbyte.fe
index 9d1a1d4..de2a923 100644
--- a/fec/tests/types/badchar.fe
+++ b/fec/tests/types/badbyte.fe
@@ -1,6 +1,7 @@
-unit badchar;
+unit badbyte;
 
 fn main() -> i32 {
     let u: u8 = 'A';
     return u;
 }
+
diff --git a/fec/tests/types/bad_cast.fe b/fec/tests/types/badcast.fe
similarity index 81%
rename from fec/tests/types/bad_cast.fe
rename to fec/tests/types/badcast.fe
index 0eafcfc..42ec79f 100644
--- a/fec/tests/types/bad_cast.fe
+++ b/fec/tests/types/badcast.fe
@@ -1,6 +1,7 @@
-unit bad_cast;
+unit badcast;
 
 fn main() -> i32 {
     let x: i32 = true as i32;
     return x;
 }
+
diff --git a/fec/tests/types/bad_cond.fe b/fec/tests/types/badcond.fe
similarity index 79%
rename from fec/tests/types/bad_cond.fe
rename to fec/tests/types/badcond.fe
index a3968f1..5773959 100644
--- a/fec/tests/types/bad_cond.fe
+++ b/fec/tests/types/badcond.fe
@@ -1,6 +1,7 @@
-unit bad_cond;
+unit badcond;
 
 fn main() -> i32 {
     if 1 { return 0; }
     return 1;
 }
+
diff --git a/fec/tests/types/badcycle.fe b/fec/tests/types/badcyc.fe
similarity index 82%
rename from fec/tests/types/badcycle.fe
rename to fec/tests/types/badcyc.fe
index 532ea1e..1b79348 100644
--- a/fec/tests/types/badcycle.fe
+++ b/fec/tests/types/badcyc.fe
@@ -1,6 +1,8 @@
-unit badcycle;
+unit badcyc;
 
 struct A { b: B, }
 struct B { a: A, }
 
 fn main() -> i32 { return 0; }
+
+
diff --git a/fec/tests/types/badfield.fe b/fec/tests/types/badfiel.fe
similarity index 89%
rename from fec/tests/types/badfield.fe
rename to fec/tests/types/badfiel.fe
index 4fa664c..6c0d2fd 100644
--- a/fec/tests/types/badfield.fe
+++ b/fec/tests/types/badfiel.fe
@@ -1,4 +1,4 @@
-unit badfield;
+unit badfiel;
 
 struct Point { x: i32, y: i32, }
 fn main() -> i32 {
@@ -6,3 +6,4 @@ fn main() -> i32 {
     p.x = 3;
     return p.x;
 }
+
diff --git a/fec/tests/types/badfld.fe b/fec/tests/types/badfmem.fe
similarity index 87%
rename from fec/tests/types/badfld.fe
rename to fec/tests/types/badfmem.fe
index 68704be..8814d35 100644
--- a/fec/tests/types/badfld.fe
+++ b/fec/tests/types/badfmem.fe
@@ -1,6 +1,7 @@
-unit badfld;
+unit badfmem;
 struct Point { x: i32, y: i32, }
 fn main() -> i32 {
     let p: Point = Point{ x: 1 };
     return p.z;
 }
+
diff --git a/fec/tests/types/badindex.fe b/fec/tests/types/badidx.fe
similarity index 84%
rename from fec/tests/types/badindex.fe
rename to fec/tests/types/badidx.fe
index 06b1b10..19c72f7 100644
--- a/fec/tests/types/badindex.fe
+++ b/fec/tests/types/badidx.fe
@@ -1,7 +1,8 @@
-unit badindex;
+unit badidx;
 
 fn main() -> i32 {
     let a: [2]i32 = [1, 2];
     a[0] = 3;
     return a[0];
 }
+
diff --git a/fec/tests/types/badmat.fe b/fec/tests/types/badmatch.fe
similarity index 87%
rename from fec/tests/types/badmat.fe
rename to fec/tests/types/badmatch.fe
index 3c7df6a..0132224 100644
--- a/fec/tests/types/badmat.fe
+++ b/fec/tests/types/badmatch.fe
@@ -1,6 +1,7 @@
-unit badmat;
+unit badmatch;
 enum Shape { Empty, Circle(i32), }
 fn main() -> i32 {
     match Shape.Empty { Empty => 0; }
     return 0;
 }
+
diff --git a/fec/tests/types/bad_mlet.fe b/fec/tests/types/badmlet.fe
similarity index 84%
rename from fec/tests/types/bad_mlet.fe
rename to fec/tests/types/badmlet.fe
index a3960b0..7283053 100644
--- a/fec/tests/types/bad_mlet.fe
+++ b/fec/tests/types/badmlet.fe
@@ -1,6 +1,7 @@
-unit bad_mlet;
+unit badmlet;
 
 fn bad() -> void {
     var raw: [2]u8 = [1, 2];
     let s: []mut u8 = raw[..];
 }
+
diff --git a/fec/tests/types/bad_ret.fe b/fec/tests/types/badretu.fe
similarity index 72%
rename from fec/tests/types/bad_ret.fe
rename to fec/tests/types/badretu.fe
index a151ab3..bdeb958 100644
--- a/fec/tests/types/bad_ret.fe
+++ b/fec/tests/types/badretu.fe
@@ -1,5 +1,6 @@
-unit bad_ret;
+unit badretu;
 
 fn main() -> i32 {
     return true;
 }
+
diff --git a/fec/tests/types/bad_shwr.fe b/fec/tests/types/badshwr.fe
similarity index 74%
rename from fec/tests/types/bad_shwr.fe
rename to fec/tests/types/badshwr.fe
index 7c7881f..d46977b 100644
--- a/fec/tests/types/bad_shwr.fe
+++ b/fec/tests/types/badshwr.fe
@@ -1,5 +1,6 @@
-unit bad_shwr;
+unit badshwr;
 
 fn bad(s: []u8) -> void {
     s[0] = 1;
 }
+
diff --git a/fec/tests/types/badstr.fe b/fec/tests/types/badstrg.fe
similarity index 84%
rename from fec/tests/types/badstr.fe
rename to fec/tests/types/badstrg.fe
index 6219d9a..30f39e0 100644
--- a/fec/tests/types/badstr.fe
+++ b/fec/tests/types/badstrg.fe
@@ -1,6 +1,7 @@
-unit badstr;
+unit badstrg;
 fn main() -> i32 {
     var text: str = "abc";
     text[0] = 'z';
     return 0;
 }
+
diff --git a/fec/tests/types/bad_type.fe b/fec/tests/types/badtype.fe
similarity index 86%
rename from fec/tests/types/bad_type.fe
rename to fec/tests/types/badtype.fe
index 15a4aca..c3fc863 100644
--- a/fec/tests/types/bad_type.fe
+++ b/fec/tests/types/badtype.fe
@@ -1,4 +1,4 @@
-unit bad_type;
+unit badtype;
 
 fn add(a: i32, b: i32) -> i32 {
     return a + b;
@@ -7,3 +7,4 @@ fn add(a: i32, b: i32) -> i32 {
 fn main() -> i32 {
     return add(true, 1);
 }
+
diff --git a/fec/tests/types/bad_unit.fe b/fec/tests/types/badunit.fe
similarity index 78%
rename from fec/tests/types/bad_unit.fe
rename to fec/tests/types/badunit.fe
index 99d8bbd..7074a19 100644
--- a/fec/tests/types/bad_unit.fe
+++ b/fec/tests/types/badunit.fe
@@ -1,6 +1,8 @@
-unit bad_unit;
+unit badunit;
 
 fn main() -> i32 {
     var value: i32;
     return value;
 }
+
+
diff --git a/fec/tests/types/bad_unk.fe b/fec/tests/types/badunk.fe
similarity index 77%
rename from fec/tests/types/bad_unk.fe
rename to fec/tests/types/badunk.fe
index b868c3b..ec28188 100644
--- a/fec/tests/types/bad_unk.fe
+++ b/fec/tests/types/badunk.fe
@@ -1,5 +1,6 @@
-unit bad_unk;
+unit badunk;
 
 fn main() -> i32 {
     return missing_name;
 }
+
diff --git a/fec/tests/types/bad_void.fe b/fec/tests/types/badvoid.fe
similarity index 86%
rename from fec/tests/types/bad_void.fe
rename to fec/tests/types/badvoid.fe
index bf3ce1f..9ab0cae 100644
--- a/fec/tests/types/bad_void.fe
+++ b/fec/tests/types/badvoid.fe
@@ -1,4 +1,4 @@
-unit bad_void;
+unit badvoid;
 
 fn noop() {
     return;
@@ -8,3 +8,4 @@ fn main() -> i32 {
     let value: i32 = noop();
     return value;
 }
+
diff --git a/fec/tests/types/ok_arra1.fe b/fec/tests/types/okarra1.fe
similarity index 89%
rename from fec/tests/types/ok_arra1.fe
rename to fec/tests/types/okarra1.fe
index 487b1ec..8df5963 100644
--- a/fec/tests/types/ok_arra1.fe
+++ b/fec/tests/types/okarra1.fe
@@ -1,7 +1,8 @@
-unit ok_arra1;
+unit okarra1;
 
 fn main() -> i32 {
     let bytes: [3]u8 = [1, 2, 3];
     if bytes[0] == 1 and bytes[2] == 3 { return 0; }
     return 1;
 }
+
diff --git a/fec/tests/types/ok_array.fe b/fec/tests/types/okarray.fe
similarity index 92%
rename from fec/tests/types/ok_array.fe
rename to fec/tests/types/okarray.fe
index bf748bc..e11ef29 100644
--- a/fec/tests/types/ok_array.fe
+++ b/fec/tests/types/okarray.fe
@@ -1,4 +1,4 @@
-unit ok_array;
+unit okarray;
 
 fn main() -> i32 {
     let a: [3]i32 = [1, 2, 3];
@@ -7,3 +7,4 @@ fn main() -> i32 {
     if a[0] + s[1] + t[0] == 5 and s.n == 3 { return 0; }
     return 1;
 }
+
diff --git a/fec/tests/types/ok_castw.fe b/fec/tests/types/okcastw.fe
similarity index 91%
rename from fec/tests/types/ok_castw.fe
rename to fec/tests/types/okcastw.fe
index 2e962f5..5d3352e 100644
--- a/fec/tests/types/ok_castw.fe
+++ b/fec/tests/types/okcastw.fe
@@ -1,4 +1,4 @@
-unit ok_castw;
+unit okcastw;
 
 pub fn main() -> i32 {
     var x: i16 = 0;
@@ -9,3 +9,4 @@ pub fn main() -> i32 {
     if y == 3 { return 0; }
     return 1;
 }
+
diff --git a/fec/tests/types/ok_char.fe b/fec/tests/types/okcharc.fe
similarity index 91%
rename from fec/tests/types/ok_char.fe
rename to fec/tests/types/okcharc.fe
index e6939b7..cd47d6b 100644
--- a/fec/tests/types/ok_char.fe
+++ b/fec/tests/types/okcharc.fe
@@ -1,4 +1,4 @@
-unit ok_char;
+unit okcharc;
 
 fn main() -> i32 {
     let c: char = '\u0041';
@@ -7,3 +7,4 @@ fn main() -> i32 {
     if c == d and u == ('A' as u8) { return 0; }
     return 1;
 }
+
diff --git a/fec/tests/types/ok_enum.fe b/fec/tests/types/okenum.fe
similarity index 96%
rename from fec/tests/types/ok_enum.fe
rename to fec/tests/types/okenum.fe
index 581cbb3..8e6dfe4 100644
--- a/fec/tests/types/ok_enum.fe
+++ b/fec/tests/types/okenum.fe
@@ -1,4 +1,4 @@
-unit ok_enum;
+unit okenum;
 
 enum Shape { Empty, Circle(i32), Rect { w: i32, h: i32, }, }
 
@@ -14,3 +14,4 @@ fn main() -> i32 {
     if score(Shape.Circle(5)) == 5 and score(Shape.Rect{ w: 2, h: 3 }) == 6 { return 0; }
     return 1;
 }
+
diff --git a/fec/tests/types/ok_for.fe b/fec/tests/types/okfor.fe
similarity index 97%
rename from fec/tests/types/ok_for.fe
rename to fec/tests/types/okfor.fe
index 3aab7bf..d191bda 100644
--- a/fec/tests/types/ok_for.fe
+++ b/fec/tests/types/okfor.fe
@@ -1,4 +1,4 @@
-unit ok_for;
+unit okfor;
 
 fn main() -> i32 {
     var total: i32 = 0;
@@ -16,3 +16,4 @@ fn main() -> i32 {
     if total == 9 and m[0] == 2 { return 0; }
     return 1;
 }
+
diff --git a/fec/tests/types/ok_hello.fe b/fec/tests/types/okhello.fe
similarity index 95%
rename from fec/tests/types/ok_hello.fe
rename to fec/tests/types/okhello.fe
index e55fedb..ed5305b 100644
--- a/fec/tests/types/ok_hello.fe
+++ b/fec/tests/types/okhello.fe
@@ -1,4 +1,4 @@
-unit ok_hello;
+unit okhello;
 
 fn add(a: i32, b: i32) -> i32 {
     return a + b;
@@ -21,3 +21,4 @@ pub fn main() -> i32 {
         return 1;
     }
 }
+
diff --git a/fec/tests/types/ok_mutab.fe b/fec/tests/types/okmutab.fe
similarity index 93%
rename from fec/tests/types/ok_mutab.fe
rename to fec/tests/types/okmutab.fe
index dc596a2..8b44f6c 100644
--- a/fec/tests/types/ok_mutab.fe
+++ b/fec/tests/types/okmutab.fe
@@ -1,4 +1,4 @@
-unit ok_mutab;
+unit okmutab;
 
 fn takes_shared(s: []u8) -> u8 { return s[0]; }
 
@@ -9,3 +9,4 @@ fn main() -> i32 {
     if takes_shared(s) == 1 and raw[1] == 9 { return 0; }
     return 1;
 }
+
diff --git a/fec/tests/types/ok_neste.fe b/fec/tests/types/okneste.fe
similarity index 92%
rename from fec/tests/types/ok_neste.fe
rename to fec/tests/types/okneste.fe
index e8c0485..cf9c392 100644
--- a/fec/tests/types/ok_neste.fe
+++ b/fec/tests/types/okneste.fe
@@ -1,4 +1,4 @@
-unit ok_neste;
+unit okneste;
 
 struct Outer { inner: Inner, }
 struct Inner { value: i32, }
@@ -8,3 +8,4 @@ fn main() -> i32 {
     if x.inner.value == 7 { return 0; }
     return 1;
 }
+
diff --git a/fec/tests/types/ok_scope.fe b/fec/tests/types/okscope.fe
similarity index 94%
rename from fec/tests/types/ok_scope.fe
rename to fec/tests/types/okscope.fe
index 153398f..187a837 100644
--- a/fec/tests/types/ok_scope.fe
+++ b/fec/tests/types/okscope.fe
@@ -1,4 +1,4 @@
-unit ok_scope;
+unit okscope;
 
 fn register(switch: i32) -> i32 {
     let auto: i32 = switch;
@@ -13,3 +13,4 @@ fn register(switch: i32) -> i32 {
 pub fn main() -> i32 {
     return register(1);
 }
+
diff --git a/fec/tests/types/ok_str.fe b/fec/tests/types/okstrg.fe
similarity index 89%
rename from fec/tests/types/ok_str.fe
rename to fec/tests/types/okstrg.fe
index fec3064..c758382 100644
--- a/fec/tests/types/ok_str.fe
+++ b/fec/tests/types/okstrg.fe
@@ -1,7 +1,8 @@
-unit ok_str;
+unit okstrg;
 
 fn main() -> i32 {
     let text: str = "abc";
     if text[1] == ('b' as u8) and text.n == 3 { return 0; }
     return 1;
 }
+
diff --git a/fec/tests/types/ok_struc.fe b/fec/tests/types/okstruc.fe
similarity index 96%
rename from fec/tests/types/ok_struc.fe
rename to fec/tests/types/okstruc.fe
index 1754eb9..ac73d35 100644
--- a/fec/tests/types/ok_struc.fe
+++ b/fec/tests/types/okstruc.fe
@@ -1,4 +1,4 @@
-unit ok_struc;
+unit okstruc;
 
 struct Point { x: i32, y: i32, }
 packed struct PackedPoint { x: u8, y: i32, }
@@ -12,3 +12,4 @@ fn main() -> i32 {
        (Point{ x: 1, y: 2 }.x == 1) and @size_of(Natural) == 8 { return 0; }
     return 1;
 }
+