96 files changed, 204 insertions, 210 deletions
diff --git a/stdlib/project.clj b/stdlib/project.clj
index 79319f540..664704a50 100644
--- a/stdlib/project.clj
+++ b/stdlib/project.clj
@@ -1,25 +1,27 @@
-(defproject com.github.luxlang/stdlib "0.6.0-SNAPSHOT"
+(def version "0.6.0-SNAPSHOT")
+(def repo "https://github.com/LuxLang/lux")
+(def sonetype-releases "https://oss.sonatype.org/service/local/staging/deploy/maven2/")
+(def sonetype-snapshots "https://oss.sonatype.org/content/repositories/snapshots/")
+
+(defproject com.github.luxlang/stdlib #=(identity version)
   :description "Standard library for the Lux programming language."
-  :url "https://github.com/LuxLang/stdlib"
+  :url ~repo
   :license {:name "Lux License v0.1"
-            :url "https://github.com/LuxLang/lux/blob/master/license.txt"}
-  :plugins [[com.github.luxlang/lein-luxc "0.6.0-SNAPSHOT"]]
-  :deploy-repositories [["releases" {:url "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
-                                     :creds :gpg}]
-                        ["snapshots" {:url "https://oss.sonatype.org/content/repositories/snapshots/"
-                                      :creds :gpg}]]
+            :url ~(str repo "/blob/master/license.txt")}
+  :plugins [[com.github.luxlang/lein-luxc ~version]]
+  :deploy-repositories [["releases" {:url ~sonetype-releases :creds :gpg}]
+                        ["snapshots" {:url ~sonetype-snapshots :creds :gpg}]]
   :pom-addition [:developers [:developer
                               [:name "Eduardo Julian"]
                               [:url "https://github.com/eduardoejp"]]]
-  :repositories [["snapshots" "https://oss.sonatype.org/content/repositories/snapshots/"]
-                 ["releases" "https://oss.sonatype.org/service/local/staging/deploy/maven2/"]]
+  :repositories [["releases" ~sonetype-releases]
+                 ["snapshots" ~sonetype-snapshots]]
   :scm {:name "git"
-        :url "https://github.com/LuxLang/lux.git"}
+        :url ~(str repo ".git")}
 
   :source-paths ["source"]
   :profiles {:library {:dependencies []
-                       :test-paths ["test"]
-                       :lux {:tests {:jvm "test"}}}
+                       :lux {:tests {:jvm "test/lux"}}}
              :documentation {:dependencies []
                              :lux {:program {:jvm "program/scriptum"}}}}
   )
diff --git a/stdlib/test/test/lux.lux b/stdlib/source/test/lux.lux
index f47d9302f..51f5c8277 100644
--- a/stdlib/test/test/lux.lux
+++ b/stdlib/source/test/lux.lux
@@ -1,5 +1,7 @@
 (.module:
   [lux #*
+   [cli (#+ program:)]
+   ["." io (#+ io)]
    [control
     [monad (#+ do)]
     [predicate (#+ Predicate)]]
@@ -9,13 +11,194 @@
    ["." function]
    ["." math
     ["r" random (#+ Random) ("r/." functor)]]
-   ["_" test (#+ Test)]]
+   ["_" test (#+ Test)]
+   ## These modules do not need to be tested.
+   [type
+    [variance (#+)]]
+   [locale (#+)
+    [language (#+)]
+    [territory (#+)]]
+   ## TODO: Test these modules
+   [data
+    [format
+     [css (#+)]
+     [markdown (#+)]]]
+   ## [control
+   ##  ["._" contract]
+   ##  ["._" concatenative]
+   ##  ["._" predicate]
+   ##  [monad
+   ##   ["._" free]]]
+   ## [data
+   ##  ["._" env]
+   ##  ["._" trace]
+   ##  ["._" store]
+   ##  [format
+   ##   ["._" context]
+   ##   ["._" html]
+   ##   ["._" css]
+   ##   ["._" binary]]
+   ##  [collection
+   ##   [tree
+   ##    [rose
+   ##     ["._" parser]]]
+   ##   [dictionary
+   ##    ["._" plist]]
+   ##   [set
+   ##    ["._" multi]]]
+   ##  [text
+   ##   ["._" buffer]]]
+   ## ["._" macro
+   ##  [poly
+   ##   ["._" json]]]
+   ## [type
+   ##  ["._" unit]
+   ##  ["._" refinement]
+   ##  ["._" quotient]]
+   ## [world
+   ##  ["._" environment]
+   ##  ["._" console]]
+   ## [compiler
+   ##  [host
+   ##   [".H" scheme]]
+   ##  ["._" cli]
+   ##  ["._" default
+   ##   ["._" evaluation]
+   ##   [phase
+   ##    ["._" translation
+   ##     [scheme
+   ##      ["._scheme" primitive]
+   ##      ["._scheme" structure]
+   ##      ["._scheme" reference]
+   ##      ["._scheme" function]
+   ##      ["._scheme" loop]
+   ##      ["._scheme" case]
+   ##      ["._scheme" extension]
+   ##      ["._scheme" extension/common]
+   ##      ["._scheme" expression]]]
+   ##    [extension
+   ##     ["._" statement]]]
+   ##   ["._default" cache]]
+   ##  [meta
+   ##   ["._meta" io
+   ##    ["._meta_io" context]
+   ##    ["._meta_io" archive]]
+   ##   ["._meta" archive]
+   ##   ["._meta" cache]]]
+   ## ["._" interpreter
+   ##  ["._interpreter" type]]
+   ]
+  ## TODO: Must have 100% coverage on tests.
   [/
    ["/." cli]
    ["/." io]
    ["/." host
     ["/." jvm]]
-   ["/." control]])
+   ["/." control]]
+  ## [control
+  ##  ## [interval (#+)]
+  ##  ## [pipe (#+)]
+  ##  ## [continuation (#+)]
+  ##  ## [reader (#+)]
+  ##  ## [writer (#+)]
+  ##  ## [state (#+)]
+  ##  ## [parser (#+)]
+  ##  ## [thread (#+)]
+  ##  ## [region (#+)]
+  ##  ## [security
+  ##  ##  [privacy (#+)]
+  ##  ##  [integrity (#+)]]
+  ##  [concurrency
+  ##   [actor (#+)]
+  ##   [atom (#+)]
+  ##   [frp (#+)]
+  ##   [promise (#+)]
+  ##   [stm (#+)]
+  ##   ## [semaphore (#+)]
+  ##   ]]
+  ## [data
+  ##  [bit (#+)]
+  ##  [color (#+)]
+  ##  [error (#+)]
+  ##  [name (#+)]
+  ##  [identity (#+)]
+  ##  [lazy (#+)]
+  ##  [maybe (#+)]
+  ##  [product (#+)]
+  ##  [sum (#+)]
+  ##  [number (#+) ## TODO: FIX Specially troublesome...
+  ##   [i64 (#+)]
+  ##   [ratio (#+)]
+  ##   [complex (#+)]]
+  ##  [text (#+)
+  ##   ## [format (#+)]
+  ##   [lexer (#+)]
+  ##   [regex (#+)]]
+  ##  [format
+  ##   ## [json (#+)]
+  ##   [xml (#+)]]
+  ##  ## [collection
+  ##  ##  [array (#+)]
+  ##  ##  [bits (#+)]
+  ##  ##  [list (#+)]
+  ##  ##  [stack (#+)]
+  ##  ##  [row (#+)]
+  ##  ##  [sequence (#+)]
+  ##  ##  [dictionary (#+)
+  ##  ##   ["dictionary_." ordered]]
+  ##  ##  [set (#+)
+  ##  ##   ["set_." ordered]]
+  ##  ##  [queue (#+)
+  ##  ##   [priority (#+)]]
+  ##  ##  [tree
+  ##  ##   [rose (#+)
+  ##  ##    [zipper (#+)]]]]
+  ##  ]
+  ## [math (#+)
+  ##  [random (#+)]
+  ##  [modular (#+)]
+  ##  [logic
+  ##   [continuous (#+)]
+  ##   [fuzzy (#+)]]]
+  ## [macro
+  ##  [code (#+)]
+  ##  [syntax (#+)]
+  ##  [poly
+  ##   ["poly_." equivalence]
+  ##   ["poly_." functor]]]
+  ## [type ## (#+)
+  ##  ## [check (#+)]
+  ##  ## [implicit (#+)] ## TODO: FIX Specially troublesome...
+  ##  ## [resource (#+)]
+  ##  [dynamic (#+)]]
+  ## [time
+  ##  [instant (#+)]
+  ##  [duration (#+)]
+  ##  [date (#+)]]
+  ## [compiler
+  ##  [default
+  ##   ["_default/." syntax]
+  ##   [phase
+  ##    [analysis
+  ##     ["_.A" primitive]
+  ##     ["_.A" structure]
+  ##     ["_.A" reference]
+  ##     ["_.A" case]
+  ##     ["_.A" function]
+  ##     [procedure
+  ##      ["_.A" common]]]
+  ##    [synthesis
+  ##     ["_.S" primitive]
+  ##     ["_.S" structure]
+  ##     ["_.S" case]
+  ##     ["_.S" function]]]]]
+  ## [world
+  ##  [binary (#+)]
+  ##  [file (#+)]
+  ##  [net
+  ##   [tcp (#+)]
+  ##   [udp (#+)]]]
+  )
 
 (def: identity
   Test
@@ -246,3 +429,7 @@
       (<| (_.context "/control")
           /control.test)
       ))
+
+(program: args
+  (io (_.run! (<| (_.times 100)
+                  ..test))))
diff --git a/stdlib/test/test/lux/cli.lux b/stdlib/source/test/lux/cli.lux
index e202b3aa7..e202b3aa7 100644
--- a/stdlib/test/test/lux/cli.lux
+++ b/stdlib/source/test/lux/cli.lux
diff --git a/stdlib/test/test/lux/compiler/default/phase/analysis/case.lux b/stdlib/source/test/lux/compiler/default/phase/analysis/case.lux
index 2bf02bb0e..2bf02bb0e 100644
--- a/stdlib/test/test/lux/compiler/default/phase/analysis/case.lux
+++ b/stdlib/source/test/lux/compiler/default/phase/analysis/case.lux
diff --git a/stdlib/test/test/lux/compiler/default/phase/analysis/function.lux b/stdlib/source/test/lux/compiler/default/phase/analysis/function.lux
index 0ec5d4766..0ec5d4766 100644
--- a/stdlib/test/test/lux/compiler/default/phase/analysis/function.lux
+++ b/stdlib/source/test/lux/compiler/default/phase/analysis/function.lux
diff --git a/stdlib/test/test/lux/compiler/default/phase/analysis/primitive.lux b/stdlib/source/test/lux/compiler/default/phase/analysis/primitive.lux
index de079094b..de079094b 100644
--- a/stdlib/test/test/lux/compiler/default/phase/analysis/primitive.lux
+++ b/stdlib/source/test/lux/compiler/default/phase/analysis/primitive.lux
diff --git a/stdlib/test/test/lux/compiler/default/phase/analysis/procedure/common.lux b/stdlib/source/test/lux/compiler/default/phase/analysis/procedure/common.lux
index 6576ae90d..6576ae90d 100644
--- a/stdlib/test/test/lux/compiler/default/phase/analysis/procedure/common.lux
+++ b/stdlib/source/test/lux/compiler/default/phase/analysis/procedure/common.lux
diff --git a/stdlib/test/test/lux/compiler/default/phase/analysis/reference.lux b/stdlib/source/test/lux/compiler/default/phase/analysis/reference.lux
index 18ab58fa9..18ab58fa9 100644
--- a/stdlib/test/test/lux/compiler/default/phase/analysis/reference.lux
+++ b/stdlib/source/test/lux/compiler/default/phase/analysis/reference.lux
diff --git a/stdlib/test/test/lux/compiler/default/phase/analysis/structure.lux b/stdlib/source/test/lux/compiler/default/phase/analysis/structure.lux
index 63c6da493..63c6da493 100644
--- a/stdlib/test/test/lux/compiler/default/phase/analysis/structure.lux
+++ b/stdlib/source/test/lux/compiler/default/phase/analysis/structure.lux
diff --git a/stdlib/test/test/lux/compiler/default/phase/synthesis/case.lux b/stdlib/source/test/lux/compiler/default/phase/synthesis/case.lux
index 319d4ab57..319d4ab57 100644
--- a/stdlib/test/test/lux/compiler/default/phase/synthesis/case.lux
+++ b/stdlib/source/test/lux/compiler/default/phase/synthesis/case.lux
diff --git a/stdlib/test/test/lux/compiler/default/phase/synthesis/function.lux b/stdlib/source/test/lux/compiler/default/phase/synthesis/function.lux
index f2565dfa0..f2565dfa0 100644
--- a/stdlib/test/test/lux/compiler/default/phase/synthesis/function.lux
+++ b/stdlib/source/test/lux/compiler/default/phase/synthesis/function.lux
diff --git a/stdlib/test/test/lux/compiler/default/phase/synthesis/primitive.lux b/stdlib/source/test/lux/compiler/default/phase/synthesis/primitive.lux
index 87dccc9f5..87dccc9f5 100644
--- a/stdlib/test/test/lux/compiler/default/phase/synthesis/primitive.lux
+++ b/stdlib/source/test/lux/compiler/default/phase/synthesis/primitive.lux
diff --git a/stdlib/test/test/lux/compiler/default/phase/synthesis/structure.lux b/stdlib/source/test/lux/compiler/default/phase/synthesis/structure.lux
index 7f9eae209..7f9eae209 100644
--- a/stdlib/test/test/lux/compiler/default/phase/synthesis/structure.lux
+++ b/stdlib/source/test/lux/compiler/default/phase/synthesis/structure.lux
diff --git a/stdlib/test/test/lux/compiler/default/syntax.lux b/stdlib/source/test/lux/compiler/default/syntax.lux
index fb83bda4c..fb83bda4c 100644
--- a/stdlib/test/test/lux/compiler/default/syntax.lux
+++ b/stdlib/source/test/lux/compiler/default/syntax.lux
diff --git a/stdlib/test/test/lux/control.lux b/stdlib/source/test/lux/control.lux
index f50bdf7a7..f50bdf7a7 100644
--- a/stdlib/test/test/lux/control.lux
+++ b/stdlib/source/test/lux/control.lux
diff --git a/stdlib/test/test/lux/control/apply.lux b/stdlib/source/test/lux/control/apply.lux
index 01fb33797..01fb33797 100644
--- a/stdlib/test/test/lux/control/apply.lux
+++ b/stdlib/source/test/lux/control/apply.lux
diff --git a/stdlib/test/test/lux/control/concurrency/actor.lux b/stdlib/source/test/lux/control/concurrency/actor.lux
index c035cabe2..c035cabe2 100644
--- a/stdlib/test/test/lux/control/concurrency/actor.lux
+++ b/stdlib/source/test/lux/control/concurrency/actor.lux
diff --git a/stdlib/test/test/lux/control/concurrency/atom.lux b/stdlib/source/test/lux/control/concurrency/atom.lux
index 720547e27..720547e27 100644
--- a/stdlib/test/test/lux/control/concurrency/atom.lux
+++ b/stdlib/source/test/lux/control/concurrency/atom.lux
diff --git a/stdlib/test/test/lux/control/concurrency/frp.lux b/stdlib/source/test/lux/control/concurrency/frp.lux
index cfe70ff0e..cfe70ff0e 100644
--- a/stdlib/test/test/lux/control/concurrency/frp.lux
+++ b/stdlib/source/test/lux/control/concurrency/frp.lux
diff --git a/stdlib/test/test/lux/control/concurrency/promise.lux b/stdlib/source/test/lux/control/concurrency/promise.lux
index e50320901..e50320901 100644
--- a/stdlib/test/test/lux/control/concurrency/promise.lux
+++ b/stdlib/source/test/lux/control/concurrency/promise.lux
diff --git a/stdlib/test/test/lux/control/concurrency/semaphore.lux b/stdlib/source/test/lux/control/concurrency/semaphore.lux
index 0c4167ee7..0c4167ee7 100644
--- a/stdlib/test/test/lux/control/concurrency/semaphore.lux
+++ b/stdlib/source/test/lux/control/concurrency/semaphore.lux
diff --git a/stdlib/test/test/lux/control/concurrency/stm.lux b/stdlib/source/test/lux/control/concurrency/stm.lux
index 966ab6007..966ab6007 100644
--- a/stdlib/test/test/lux/control/concurrency/stm.lux
+++ b/stdlib/source/test/lux/control/concurrency/stm.lux
diff --git a/stdlib/test/test/lux/control/continuation.lux b/stdlib/source/test/lux/control/continuation.lux
index 0dbbe7dc5..0dbbe7dc5 100644
--- a/stdlib/test/test/lux/control/continuation.lux
+++ b/stdlib/source/test/lux/control/continuation.lux
diff --git a/stdlib/test/test/lux/control/equivalence.lux b/stdlib/source/test/lux/control/equivalence.lux
index daa2c81b3..daa2c81b3 100644
--- a/stdlib/test/test/lux/control/equivalence.lux
+++ b/stdlib/source/test/lux/control/equivalence.lux
diff --git a/stdlib/test/test/lux/control/exception.lux b/stdlib/source/test/lux/control/exception.lux
index 434ffc5d0..434ffc5d0 100644
--- a/stdlib/test/test/lux/control/exception.lux
+++ b/stdlib/source/test/lux/control/exception.lux
diff --git a/stdlib/test/test/lux/control/functor.lux b/stdlib/source/test/lux/control/functor.lux
index a93edc291..a93edc291 100644
--- a/stdlib/test/test/lux/control/functor.lux
+++ b/stdlib/source/test/lux/control/functor.lux
diff --git a/stdlib/test/test/lux/control/interval.lux b/stdlib/source/test/lux/control/interval.lux
index 6d00a36e9..6d00a36e9 100644
--- a/stdlib/test/test/lux/control/interval.lux
+++ b/stdlib/source/test/lux/control/interval.lux
diff --git a/stdlib/test/test/lux/control/monad.lux b/stdlib/source/test/lux/control/monad.lux
index 412f3ab94..412f3ab94 100644
--- a/stdlib/test/test/lux/control/monad.lux
+++ b/stdlib/source/test/lux/control/monad.lux
diff --git a/stdlib/test/test/lux/control/parser.lux b/stdlib/source/test/lux/control/parser.lux
index c9d568495..c9d568495 100644
--- a/stdlib/test/test/lux/control/parser.lux
+++ b/stdlib/source/test/lux/control/parser.lux
diff --git a/stdlib/test/test/lux/control/pipe.lux b/stdlib/source/test/lux/control/pipe.lux
index aaaa18616..aaaa18616 100644
--- a/stdlib/test/test/lux/control/pipe.lux
+++ b/stdlib/source/test/lux/control/pipe.lux
diff --git a/stdlib/test/test/lux/control/reader.lux b/stdlib/source/test/lux/control/reader.lux
index 638e11519..638e11519 100644
--- a/stdlib/test/test/lux/control/reader.lux
+++ b/stdlib/source/test/lux/control/reader.lux
diff --git a/stdlib/test/test/lux/control/region.lux b/stdlib/source/test/lux/control/region.lux
index ff6bdaeaf..ff6bdaeaf 100644
--- a/stdlib/test/test/lux/control/region.lux
+++ b/stdlib/source/test/lux/control/region.lux
diff --git a/stdlib/test/test/lux/control/security/integrity.lux b/stdlib/source/test/lux/control/security/integrity.lux
index f306cf7e5..f306cf7e5 100644
--- a/stdlib/test/test/lux/control/security/integrity.lux
+++ b/stdlib/source/test/lux/control/security/integrity.lux
diff --git a/stdlib/test/test/lux/control/security/privacy.lux b/stdlib/source/test/lux/control/security/privacy.lux
index 72c23e4c1..72c23e4c1 100644
--- a/stdlib/test/test/lux/control/security/privacy.lux
+++ b/stdlib/source/test/lux/control/security/privacy.lux
diff --git a/stdlib/test/test/lux/control/state.lux b/stdlib/source/test/lux/control/state.lux
index 948cbd5bf..948cbd5bf 100644
--- a/stdlib/test/test/lux/control/state.lux
+++ b/stdlib/source/test/lux/control/state.lux
diff --git a/stdlib/test/test/lux/control/thread.lux b/stdlib/source/test/lux/control/thread.lux
index 8f31addbb..8f31addbb 100644
--- a/stdlib/test/test/lux/control/thread.lux
+++ b/stdlib/source/test/lux/control/thread.lux
diff --git a/stdlib/test/test/lux/control/writer.lux b/stdlib/source/test/lux/control/writer.lux
index b5fb372d8..b5fb372d8 100644
--- a/stdlib/test/test/lux/control/writer.lux
+++ b/stdlib/source/test/lux/control/writer.lux
diff --git a/stdlib/test/test/lux/data/bit.lux b/stdlib/source/test/lux/data/bit.lux
index d064a736b..d064a736b 100644
--- a/stdlib/test/test/lux/data/bit.lux
+++ b/stdlib/source/test/lux/data/bit.lux
diff --git a/stdlib/test/test/lux/data/collection/array.lux b/stdlib/source/test/lux/data/collection/array.lux
index 47c384cb7..47c384cb7 100644
--- a/stdlib/test/test/lux/data/collection/array.lux
+++ b/stdlib/source/test/lux/data/collection/array.lux
diff --git a/stdlib/test/test/lux/data/collection/bits.lux b/stdlib/source/test/lux/data/collection/bits.lux
index aeeac1429..aeeac1429 100644
--- a/stdlib/test/test/lux/data/collection/bits.lux
+++ b/stdlib/source/test/lux/data/collection/bits.lux
diff --git a/stdlib/test/test/lux/data/collection/dictionary.lux b/stdlib/source/test/lux/data/collection/dictionary.lux
index 3ad45704e..3ad45704e 100644
--- a/stdlib/test/test/lux/data/collection/dictionary.lux
+++ b/stdlib/source/test/lux/data/collection/dictionary.lux
diff --git a/stdlib/test/test/lux/data/collection/dictionary/ordered.lux b/stdlib/source/test/lux/data/collection/dictionary/ordered.lux
index 6b1f131cb..6b1f131cb 100644
--- a/stdlib/test/test/lux/data/collection/dictionary/ordered.lux
+++ b/stdlib/source/test/lux/data/collection/dictionary/ordered.lux
diff --git a/stdlib/test/test/lux/data/collection/list.lux b/stdlib/source/test/lux/data/collection/list.lux
index 9919f3dd1..9919f3dd1 100644
--- a/stdlib/test/test/lux/data/collection/list.lux
+++ b/stdlib/source/test/lux/data/collection/list.lux
diff --git a/stdlib/test/test/lux/data/collection/queue.lux b/stdlib/source/test/lux/data/collection/queue.lux
index 4f4f12ef0..4f4f12ef0 100644
--- a/stdlib/test/test/lux/data/collection/queue.lux
+++ b/stdlib/source/test/lux/data/collection/queue.lux
diff --git a/stdlib/test/test/lux/data/collection/queue/priority.lux b/stdlib/source/test/lux/data/collection/queue/priority.lux
index 3868a01a8..3868a01a8 100644
--- a/stdlib/test/test/lux/data/collection/queue/priority.lux
+++ b/stdlib/source/test/lux/data/collection/queue/priority.lux
diff --git a/stdlib/test/test/lux/data/collection/row.lux b/stdlib/source/test/lux/data/collection/row.lux
index 2eb342e6e..2eb342e6e 100644
--- a/stdlib/test/test/lux/data/collection/row.lux
+++ b/stdlib/source/test/lux/data/collection/row.lux
diff --git a/stdlib/test/test/lux/data/collection/sequence.lux b/stdlib/source/test/lux/data/collection/sequence.lux
index de398e6f6..de398e6f6 100644
--- a/stdlib/test/test/lux/data/collection/sequence.lux
+++ b/stdlib/source/test/lux/data/collection/sequence.lux
diff --git a/stdlib/test/test/lux/data/collection/set.lux b/stdlib/source/test/lux/data/collection/set.lux
index bbdc945f7..bbdc945f7 100644
--- a/stdlib/test/test/lux/data/collection/set.lux
+++ b/stdlib/source/test/lux/data/collection/set.lux
diff --git a/stdlib/test/test/lux/data/collection/set/ordered.lux b/stdlib/source/test/lux/data/collection/set/ordered.lux
index 384a0506b..384a0506b 100644
--- a/stdlib/test/test/lux/data/collection/set/ordered.lux
+++ b/stdlib/source/test/lux/data/collection/set/ordered.lux
diff --git a/stdlib/test/test/lux/data/collection/stack.lux b/stdlib/source/test/lux/data/collection/stack.lux
index d203b4246..d203b4246 100644
--- a/stdlib/test/test/lux/data/collection/stack.lux
+++ b/stdlib/source/test/lux/data/collection/stack.lux
diff --git a/stdlib/test/test/lux/data/collection/tree/rose.lux b/stdlib/source/test/lux/data/collection/tree/rose.lux
index 47dbf94cf..47dbf94cf 100644
--- a/stdlib/test/test/lux/data/collection/tree/rose.lux
+++ b/stdlib/source/test/lux/data/collection/tree/rose.lux
diff --git a/stdlib/test/test/lux/data/collection/tree/rose/zipper.lux b/stdlib/source/test/lux/data/collection/tree/rose/zipper.lux
index 3abf1dd26..3abf1dd26 100644
--- a/stdlib/test/test/lux/data/collection/tree/rose/zipper.lux
+++ b/stdlib/source/test/lux/data/collection/tree/rose/zipper.lux
diff --git a/stdlib/test/test/lux/data/color.lux b/stdlib/source/test/lux/data/color.lux
index 503421db2..503421db2 100644
--- a/stdlib/test/test/lux/data/color.lux
+++ b/stdlib/source/test/lux/data/color.lux
diff --git a/stdlib/test/test/lux/data/error.lux b/stdlib/source/test/lux/data/error.lux
index 7f491dc2c..7f491dc2c 100644
--- a/stdlib/test/test/lux/data/error.lux
+++ b/stdlib/source/test/lux/data/error.lux
diff --git a/stdlib/test/test/lux/data/format/json.lux b/stdlib/source/test/lux/data/format/json.lux
index f54b51c3b..f54b51c3b 100644
--- a/stdlib/test/test/lux/data/format/json.lux
+++ b/stdlib/source/test/lux/data/format/json.lux
diff --git a/stdlib/test/test/lux/data/format/xml.lux b/stdlib/source/test/lux/data/format/xml.lux
index 0f86eb63d..0f86eb63d 100644
--- a/stdlib/test/test/lux/data/format/xml.lux
+++ b/stdlib/source/test/lux/data/format/xml.lux
diff --git a/stdlib/test/test/lux/data/identity.lux b/stdlib/source/test/lux/data/identity.lux
index 31bf105cd..31bf105cd 100644
--- a/stdlib/test/test/lux/data/identity.lux
+++ b/stdlib/source/test/lux/data/identity.lux
diff --git a/stdlib/test/test/lux/data/lazy.lux b/stdlib/source/test/lux/data/lazy.lux
index f00b572ab..f00b572ab 100644
--- a/stdlib/test/test/lux/data/lazy.lux
+++ b/stdlib/source/test/lux/data/lazy.lux
diff --git a/stdlib/test/test/lux/data/maybe.lux b/stdlib/source/test/lux/data/maybe.lux
index eb09491a1..eb09491a1 100644
--- a/stdlib/test/test/lux/data/maybe.lux
+++ b/stdlib/source/test/lux/data/maybe.lux
diff --git a/stdlib/test/test/lux/data/name.lux b/stdlib/source/test/lux/data/name.lux
index 3855fe221..3855fe221 100644
--- a/stdlib/test/test/lux/data/name.lux
+++ b/stdlib/source/test/lux/data/name.lux
diff --git a/stdlib/test/test/lux/data/number.lux b/stdlib/source/test/lux/data/number.lux
index 9d870ab08..9d870ab08 100644
--- a/stdlib/test/test/lux/data/number.lux
+++ b/stdlib/source/test/lux/data/number.lux
diff --git a/stdlib/test/test/lux/data/number/complex.lux b/stdlib/source/test/lux/data/number/complex.lux
index 850845296..850845296 100644
--- a/stdlib/test/test/lux/data/number/complex.lux
+++ b/stdlib/source/test/lux/data/number/complex.lux
diff --git a/stdlib/test/test/lux/data/number/i64.lux b/stdlib/source/test/lux/data/number/i64.lux
index 62de5e56e..62de5e56e 100644
--- a/stdlib/test/test/lux/data/number/i64.lux
+++ b/stdlib/source/test/lux/data/number/i64.lux
diff --git a/stdlib/test/test/lux/data/number/ratio.lux b/stdlib/source/test/lux/data/number/ratio.lux
index 63d1e5fc8..63d1e5fc8 100644
--- a/stdlib/test/test/lux/data/number/ratio.lux
+++ b/stdlib/source/test/lux/data/number/ratio.lux
diff --git a/stdlib/test/test/lux/data/product.lux b/stdlib/source/test/lux/data/product.lux
index 86db80d0e..86db80d0e 100644
--- a/stdlib/test/test/lux/data/product.lux
+++ b/stdlib/source/test/lux/data/product.lux
diff --git a/stdlib/test/test/lux/data/sum.lux b/stdlib/source/test/lux/data/sum.lux
index d47922304..d47922304 100644
--- a/stdlib/test/test/lux/data/sum.lux
+++ b/stdlib/source/test/lux/data/sum.lux
diff --git a/stdlib/test/test/lux/data/text.lux b/stdlib/source/test/lux/data/text.lux
index 01cd2220d..01cd2220d 100644
--- a/stdlib/test/test/lux/data/text.lux
+++ b/stdlib/source/test/lux/data/text.lux
diff --git a/stdlib/test/test/lux/data/text/format.lux b/stdlib/source/test/lux/data/text/format.lux
index d3bbafe7e..d3bbafe7e 100644
--- a/stdlib/test/test/lux/data/text/format.lux
+++ b/stdlib/source/test/lux/data/text/format.lux
diff --git a/stdlib/test/test/lux/data/text/lexer.lux b/stdlib/source/test/lux/data/text/lexer.lux
index a1e52b64c..a1e52b64c 100644
--- a/stdlib/test/test/lux/data/text/lexer.lux
+++ b/stdlib/source/test/lux/data/text/lexer.lux
diff --git a/stdlib/test/test/lux/data/text/regex.lux b/stdlib/source/test/lux/data/text/regex.lux
index f6bc7d098..f6bc7d098 100644
--- a/stdlib/test/test/lux/data/text/regex.lux
+++ b/stdlib/source/test/lux/data/text/regex.lux
diff --git a/stdlib/test/test/lux/host.js.lux b/stdlib/source/test/lux/host.js.lux
index faf9f6b5f..faf9f6b5f 100644
--- a/stdlib/test/test/lux/host.js.lux
+++ b/stdlib/source/test/lux/host.js.lux
diff --git a/stdlib/test/test/lux/host.jvm.lux b/stdlib/source/test/lux/host.jvm.lux
index 3de5e28d7..3de5e28d7 100644
--- a/stdlib/test/test/lux/host.jvm.lux
+++ b/stdlib/source/test/lux/host.jvm.lux
diff --git a/stdlib/test/test/lux/host/jvm.jvm.lux b/stdlib/source/test/lux/host/jvm.jvm.lux
index d8224d214..d8224d214 100644
--- a/stdlib/test/test/lux/host/jvm.jvm.lux
+++ b/stdlib/source/test/lux/host/jvm.jvm.lux
diff --git a/stdlib/test/test/lux/io.lux b/stdlib/source/test/lux/io.lux
index a14a240cb..a14a240cb 100644
--- a/stdlib/test/test/lux/io.lux
+++ b/stdlib/source/test/lux/io.lux
diff --git a/stdlib/test/test/lux/macro/code.lux b/stdlib/source/test/lux/macro/code.lux
index 02baf04a5..02baf04a5 100644
--- a/stdlib/test/test/lux/macro/code.lux
+++ b/stdlib/source/test/lux/macro/code.lux
diff --git a/stdlib/test/test/lux/macro/poly/equivalence.lux b/stdlib/source/test/lux/macro/poly/equivalence.lux
index 3d943f6e6..3d943f6e6 100644
--- a/stdlib/test/test/lux/macro/poly/equivalence.lux
+++ b/stdlib/source/test/lux/macro/poly/equivalence.lux
diff --git a/stdlib/test/test/lux/macro/poly/functor.lux b/stdlib/source/test/lux/macro/poly/functor.lux
index 873259496..873259496 100644
--- a/stdlib/test/test/lux/macro/poly/functor.lux
+++ b/stdlib/source/test/lux/macro/poly/functor.lux
diff --git a/stdlib/test/test/lux/macro/syntax.lux b/stdlib/source/test/lux/macro/syntax.lux
index ff8c1c433..ff8c1c433 100644
--- a/stdlib/test/test/lux/macro/syntax.lux
+++ b/stdlib/source/test/lux/macro/syntax.lux
diff --git a/stdlib/test/test/lux/math.lux b/stdlib/source/test/lux/math.lux
index 002cdaa41..002cdaa41 100644
--- a/stdlib/test/test/lux/math.lux
+++ b/stdlib/source/test/lux/math.lux
diff --git a/stdlib/test/test/lux/math/logic/continuous.lux b/stdlib/source/test/lux/math/logic/continuous.lux
index b9db253f6..b9db253f6 100644
--- a/stdlib/test/test/lux/math/logic/continuous.lux
+++ b/stdlib/source/test/lux/math/logic/continuous.lux
diff --git a/stdlib/test/test/lux/math/logic/fuzzy.lux b/stdlib/source/test/lux/math/logic/fuzzy.lux
index 60223e8a3..60223e8a3 100644
--- a/stdlib/test/test/lux/math/logic/fuzzy.lux
+++ b/stdlib/source/test/lux/math/logic/fuzzy.lux
diff --git a/stdlib/test/test/lux/math/modular.lux b/stdlib/source/test/lux/math/modular.lux
index b5ff0e40b..b5ff0e40b 100644
--- a/stdlib/test/test/lux/math/modular.lux
+++ b/stdlib/source/test/lux/math/modular.lux
diff --git a/stdlib/test/test/lux/math/random.lux b/stdlib/source/test/lux/math/random.lux
index acc161cc4..acc161cc4 100644
--- a/stdlib/test/test/lux/math/random.lux
+++ b/stdlib/source/test/lux/math/random.lux
diff --git a/stdlib/test/test/lux/time/date.lux b/stdlib/source/test/lux/time/date.lux
index d89ccccc8..d89ccccc8 100644
--- a/stdlib/test/test/lux/time/date.lux
+++ b/stdlib/source/test/lux/time/date.lux
diff --git a/stdlib/test/test/lux/time/duration.lux b/stdlib/source/test/lux/time/duration.lux
index 3aba23203..3aba23203 100644
--- a/stdlib/test/test/lux/time/duration.lux
+++ b/stdlib/source/test/lux/time/duration.lux
diff --git a/stdlib/test/test/lux/time/instant.lux b/stdlib/source/test/lux/time/instant.lux
index c9d7aad55..c9d7aad55 100644
--- a/stdlib/test/test/lux/time/instant.lux
+++ b/stdlib/source/test/lux/time/instant.lux
diff --git a/stdlib/test/test/lux/type.lux b/stdlib/source/test/lux/type.lux
index b4796911a..b4796911a 100644
--- a/stdlib/test/test/lux/type.lux
+++ b/stdlib/source/test/lux/type.lux
diff --git a/stdlib/test/test/lux/type/check.lux b/stdlib/source/test/lux/type/check.lux
index 426127fb6..426127fb6 100644
--- a/stdlib/test/test/lux/type/check.lux
+++ b/stdlib/source/test/lux/type/check.lux
diff --git a/stdlib/test/test/lux/type/dynamic.lux b/stdlib/source/test/lux/type/dynamic.lux
index 70e26f743..70e26f743 100644
--- a/stdlib/test/test/lux/type/dynamic.lux
+++ b/stdlib/source/test/lux/type/dynamic.lux
diff --git a/stdlib/test/test/lux/type/implicit.lux b/stdlib/source/test/lux/type/implicit.lux
index 98b647bf1..98b647bf1 100644
--- a/stdlib/test/test/lux/type/implicit.lux
+++ b/stdlib/source/test/lux/type/implicit.lux
diff --git a/stdlib/test/test/lux/type/resource.lux b/stdlib/source/test/lux/type/resource.lux
index b04321cc2..b04321cc2 100644
--- a/stdlib/test/test/lux/type/resource.lux
+++ b/stdlib/source/test/lux/type/resource.lux
diff --git a/stdlib/test/test/lux/world/binary.lux b/stdlib/source/test/lux/world/binary.lux
index ec4da0d11..ec4da0d11 100644
--- a/stdlib/test/test/lux/world/binary.lux
+++ b/stdlib/source/test/lux/world/binary.lux
diff --git a/stdlib/test/test/lux/world/file.lux b/stdlib/source/test/lux/world/file.lux
index b3693f207..b3693f207 100644
--- a/stdlib/test/test/lux/world/file.lux
+++ b/stdlib/source/test/lux/world/file.lux
diff --git a/stdlib/test/test/lux/world/net/tcp.lux b/stdlib/source/test/lux/world/net/tcp.lux
index fae5ac05d..fae5ac05d 100644
--- a/stdlib/test/test/lux/world/net/tcp.lux
+++ b/stdlib/source/test/lux/world/net/tcp.lux
diff --git a/stdlib/test/test/lux/world/net/udp.lux b/stdlib/source/test/lux/world/net/udp.lux
index 2b85958fa..2b85958fa 100644
--- a/stdlib/test/test/lux/world/net/udp.lux
+++ b/stdlib/source/test/lux/world/net/udp.lux
diff --git a/stdlib/test/test.lux b/stdlib/test/test.lux
deleted file mode 100644
index f5b23ac95..000000000
--- a/stdlib/test/test.lux
+++ /dev/null
@@ -1,195 +0,0 @@
-(.module:
-  [lux #*
-   [cli (#+ program:)]
-   ["." io (#+ io)]
-   ["_" test]
-
-   ## These modules do not need to be tested.
-   [type
-    [variance (#+)]]
-   [locale (#+)
-    [language (#+)]
-    [territory (#+)]]
-   
-   ## TODO: Test these modules
-   [data
-    [format
-     [css (#+)]
-     [markdown (#+)]]]
-   ## [control
-   ##  ["._" contract]
-   ##  ["._" concatenative]
-   ##  ["._" predicate]
-   ##  [monad
-   ##   ["._" free]]]
-   ## [data
-   ##  ["._" env]
-   ##  ["._" trace]
-   ##  ["._" store]
-   ##  [format
-   ##   ["._" context]
-   ##   ["._" html]
-   ##   ["._" css]
-   ##   ["._" binary]]
-   ##  [collection
-   ##   [tree
-   ##    [rose
-   ##     ["._" parser]]]
-   ##   [dictionary
-   ##    ["._" plist]]
-   ##   [set
-   ##    ["._" multi]]]
-   ##  [text
-   ##   ["._" buffer]]]
-   ## ["._" macro
-   ##  [poly
-   ##   ["._" json]]]
-   ## [type
-   ##  ["._" unit]
-   ##  ["._" refinement]
-   ##  ["._" quotient]]
-   ## [world
-   ##  ["._" environment]
-   ##  ["._" console]]
-   ## [compiler
-   ##  [host
-   ##   [".H" scheme]]
-   ##  ["._" cli]
-   ##  ["._" default
-   ##   ["._" evaluation]
-   ##   [phase
-   ##    ["._" translation
-   ##     [scheme
-   ##      ["._scheme" primitive]
-   ##      ["._scheme" structure]
-   ##      ["._scheme" reference]
-   ##      ["._scheme" function]
-   ##      ["._scheme" loop]
-   ##      ["._scheme" case]
-   ##      ["._scheme" extension]
-   ##      ["._scheme" extension/common]
-   ##      ["._scheme" expression]]]
-   ##    [extension
-   ##     ["._" statement]]]
-   ##   ["._default" cache]]
-   ##  [meta
-   ##   ["._meta" io
-   ##    ["._meta_io" context]
-   ##    ["._meta_io" archive]]
-   ##   ["._meta" archive]
-   ##   ["._meta" cache]]]
-   ## ["._" interpreter
-   ##  ["._interpreter" type]]
-   ]
-  ## TODO: Must have 100% coverage on tests.
-  [/
-   ["/." lux
-    ## [control
-    ##  ## [interval (#+)]
-    ##  ## [pipe (#+)]
-    ##  ## [continuation (#+)]
-    ##  ## [reader (#+)]
-    ##  ## [writer (#+)]
-    ##  ## [state (#+)]
-    ##  ## [parser (#+)]
-    ##  ## [thread (#+)]
-    ##  ## [region (#+)]
-    ##  ## [security
-    ##  ##  [privacy (#+)]
-    ##  ##  [integrity (#+)]]
-    ##  [concurrency
-    ##   [actor (#+)]
-    ##   [atom (#+)]
-    ##   [frp (#+)]
-    ##   [promise (#+)]
-    ##   [stm (#+)]
-    ##   ## [semaphore (#+)]
-    ##   ]]
-    ## [data
-    ##  [bit (#+)]
-    ##  [color (#+)]
-    ##  [error (#+)]
-    ##  [name (#+)]
-    ##  [identity (#+)]
-    ##  [lazy (#+)]
-    ##  [maybe (#+)]
-    ##  [product (#+)]
-    ##  [sum (#+)]
-    ##  [number (#+) ## TODO: FIX Specially troublesome...
-    ##   [i64 (#+)]
-    ##   [ratio (#+)]
-    ##   [complex (#+)]]
-    ##  [text (#+)
-    ##   ## [format (#+)]
-    ##   [lexer (#+)]
-    ##   [regex (#+)]]
-    ##  [format
-    ##   ## [json (#+)]
-    ##   [xml (#+)]]
-    ##  ## [collection
-    ##  ##  [array (#+)]
-    ##  ##  [bits (#+)]
-    ##  ##  [list (#+)]
-    ##  ##  [stack (#+)]
-    ##  ##  [row (#+)]
-    ##  ##  [sequence (#+)]
-    ##  ##  [dictionary (#+)
-    ##  ##   ["dictionary_." ordered]]
-    ##  ##  [set (#+)
-    ##  ##   ["set_." ordered]]
-    ##  ##  [queue (#+)
-    ##  ##   [priority (#+)]]
-    ##  ##  [tree
-    ##  ##   [rose (#+)
-    ##  ##    [zipper (#+)]]]]
-    ##  ]
-    ## [math (#+)
-    ##  [random (#+)]
-    ##  [modular (#+)]
-    ##  [logic
-    ##   [continuous (#+)]
-    ##   [fuzzy (#+)]]]
-    ## [macro
-    ##  [code (#+)]
-    ##  [syntax (#+)]
-    ##  [poly
-    ##   ["poly_." equivalence]
-    ##   ["poly_." functor]]]
-    ## [type ## (#+)
-    ##  ## [check (#+)]
-    ##  ## [implicit (#+)] ## TODO: FIX Specially troublesome...
-    ##  ## [resource (#+)]
-    ##  [dynamic (#+)]]
-    ## [time
-    ##  [instant (#+)]
-    ##  [duration (#+)]
-    ##  [date (#+)]]
-    ## [compiler
-    ##  [default
-    ##   ["_default/." syntax]
-    ##   [phase
-    ##    [analysis
-    ##     ["_.A" primitive]
-    ##     ["_.A" structure]
-    ##     ["_.A" reference]
-    ##     ["_.A" case]
-    ##     ["_.A" function]
-    ##     [procedure
-    ##      ["_.A" common]]]
-    ##    [synthesis
-    ##     ["_.S" primitive]
-    ##     ["_.S" structure]
-    ##     ["_.S" case]
-    ##     ["_.S" function]]]]]
-    ## [world
-    ##  [binary (#+)]
-    ##  [file (#+)]
-    ##  [net
-    ##   [tcp (#+)]
-    ##   [udp (#+)]]]
-    ]]
-  )
-
-(program: args
-  (io (_.run! (<| (_.times 100)
-                  /lux.test))))