11 files changed, 156 insertions, 145 deletions
diff --git a/stdlib/source/test/lux/math/number.lux b/stdlib/source/test/lux/math/number.lux
index 99cf72928..b13fa5cf8 100644
--- a/stdlib/source/test/lux/math/number.lux
+++ b/stdlib/source/test/lux/math/number.lux
@@ -1,11 +1,12 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [control
-    ["." try]]
-   [data
-    ["." text]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [control
+     ["." try]]
+    [data
+     ["." text]]]]
+  [\\library
    ["." /
     ["n" nat]
     ["i" int]
diff --git a/stdlib/source/test/lux/math/number/complex.lux b/stdlib/source/test/lux/math/number/complex.lux
index d32abc2c5..2670d53dc 100644
--- a/stdlib/source/test/lux/math/number/complex.lux
+++ b/stdlib/source/test/lux/math/number/complex.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   ["%" data/text/format (#+ format)]
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]
-     ["$." order]
-     ["$." codec]]]
-   [data
-    [collection
-     ["." list ("#\." functor)]]]
-   ["." math
-    ["." random (#+ Random)]]]
-  [\\
+  [library
+   [lux #*
+    ["%" data/text/format (#+ format)]
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." order]
+      ["$." codec]]]
+    [data
+     [collection
+      ["." list ("#\." functor)]]]
+    ["." math
+     ["." random (#+ Random)]]]]
+  [\\library
    ["." /
     [//
      ["n" nat]
diff --git a/stdlib/source/test/lux/math/number/frac.lux b/stdlib/source/test/lux/math/number/frac.lux
index eb981a5b0..093511510 100644
--- a/stdlib/source/test/lux/math/number/frac.lux
+++ b/stdlib/source/test/lux/math/number/frac.lux
@@ -1,21 +1,22 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   ["@" target]
-   ["." ffi]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]
-     ["$." hash]
-     ["$." order]
-     ["$." monoid]
-     ["$." codec]]]
-   [data
-    ["." bit ("#\." equivalence)]]
-   [math
-    ["." random (#+ Random)]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    ["@" target]
+    ["." ffi]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." hash]
+      ["$." order]
+      ["$." monoid]
+      ["$." codec]]]
+    [data
+     ["." bit ("#\." equivalence)]]
+    [math
+     ["." random (#+ Random)]]]]
+  [\\library
    ["." /
     [// #*
      ["n" nat]
diff --git a/stdlib/source/test/lux/math/number/i16.lux b/stdlib/source/test/lux/math/number/i16.lux
index 4450cf88e..4720a13b7 100644
--- a/stdlib/source/test/lux/math/number/i16.lux
+++ b/stdlib/source/test/lux/math/number/i16.lux
@@ -1,13 +1,14 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [math
-    ["." random (#+ Random)]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [math
+     ["." random (#+ Random)]]]]
+  [\\library
    ["." /
     ["/#" // #_
      ["i" int]
diff --git a/stdlib/source/test/lux/math/number/i32.lux b/stdlib/source/test/lux/math/number/i32.lux
index 8b2d0e5f2..66d65fa40 100644
--- a/stdlib/source/test/lux/math/number/i32.lux
+++ b/stdlib/source/test/lux/math/number/i32.lux
@@ -1,13 +1,14 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [math
-    ["." random (#+ Random)]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [math
+     ["." random (#+ Random)]]]]
+  [\\library
    ["." /
     ["/#" // #_
      ["i" int]
diff --git a/stdlib/source/test/lux/math/number/i64.lux b/stdlib/source/test/lux/math/number/i64.lux
index 129d2bb84..942930af0 100644
--- a/stdlib/source/test/lux/math/number/i64.lux
+++ b/stdlib/source/test/lux/math/number/i64.lux
@@ -1,17 +1,18 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [data
-    ["." bit ("#\." equivalence)]]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]
-     ["$." hash]
-     ["$." monoid]]]
-   [math
-    ["." random (#+ Random)]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [data
+     ["." bit ("#\." equivalence)]]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." hash]
+      ["$." monoid]]]
+    [math
+     ["." random (#+ Random)]]]]
+  [\\library
    ["." / ("\." equivalence)
     [// (#+ hex)
      ["n" nat]
diff --git a/stdlib/source/test/lux/math/number/i8.lux b/stdlib/source/test/lux/math/number/i8.lux
index 1f5c7de42..c5fee1fcf 100644
--- a/stdlib/source/test/lux/math/number/i8.lux
+++ b/stdlib/source/test/lux/math/number/i8.lux
@@ -1,13 +1,14 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]]]
-   [math
-    ["." random (#+ Random)]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]]]
+    [math
+     ["." random (#+ Random)]]]]
+  [\\library
    ["." /
     ["/#" // #_
      ["i" int]
diff --git a/stdlib/source/test/lux/math/number/int.lux b/stdlib/source/test/lux/math/number/int.lux
index f339b3ac4..47e381985 100644
--- a/stdlib/source/test/lux/math/number/int.lux
+++ b/stdlib/source/test/lux/math/number/int.lux
@@ -1,21 +1,22 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]
-     ["$." hash]
-     ["$." order]
-     ["$." enum]
-     ["$." interval]
-     ["$." monoid]
-     ["$." codec]]]
-   [data
-    ["." bit ("#\." equivalence)]]
-   [math
-    ["." random (#+ Random)]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." hash]
+      ["$." order]
+      ["$." enum]
+      ["$." interval]
+      ["$." monoid]
+      ["$." codec]]]
+    [data
+     ["." bit ("#\." equivalence)]]
+    [math
+     ["." random (#+ Random)]]]]
+  [\\library
    ["." /
     [//
      ["n" nat]
diff --git a/stdlib/source/test/lux/math/number/nat.lux b/stdlib/source/test/lux/math/number/nat.lux
index 26a872067..ff3eb64d1 100644
--- a/stdlib/source/test/lux/math/number/nat.lux
+++ b/stdlib/source/test/lux/math/number/nat.lux
@@ -1,21 +1,22 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]
-     ["$." hash]
-     ["$." order]
-     ["$." enum]
-     ["$." interval]
-     ["$." monoid]
-     ["$." codec]]]
-   [data
-    ["." bit ("#\." equivalence)]]
-   [math
-    ["." random]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." hash]
+      ["$." order]
+      ["$." enum]
+      ["$." interval]
+      ["$." monoid]
+      ["$." codec]]]
+    [data
+     ["." bit ("#\." equivalence)]]
+    [math
+     ["." random]]]]
+  [\\library
    ["." /
     [//
      ["f" frac]]]])
diff --git a/stdlib/source/test/lux/math/number/ratio.lux b/stdlib/source/test/lux/math/number/ratio.lux
index 8e8aeb0d0..838e8ca81 100644
--- a/stdlib/source/test/lux/math/number/ratio.lux
+++ b/stdlib/source/test/lux/math/number/ratio.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]
-     ["$." order]
-     ["$." monoid]
-     ["$." codec]]]
-   [data
-    ["." bit ("#\." equivalence)]
-    ["." maybe ("#\." functor)]]
-   [math
-    ["." random (#+ Random)]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." order]
+      ["$." monoid]
+      ["$." codec]]]
+    [data
+     ["." bit ("#\." equivalence)]
+     ["." maybe ("#\." functor)]]
+    [math
+     ["." random (#+ Random)]]]]
+  [\\library
    ["." /
     [//
      ["n" nat ("#\." equivalence)]]]])
diff --git a/stdlib/source/test/lux/math/number/rev.lux b/stdlib/source/test/lux/math/number/rev.lux
index e4d6b81f7..70ab24c61 100644
--- a/stdlib/source/test/lux/math/number/rev.lux
+++ b/stdlib/source/test/lux/math/number/rev.lux
@@ -1,21 +1,22 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [\spec
-     ["$." equivalence]
-     ["$." hash]
-     ["$." order]
-     ["$." enum]
-     ["$." interval]
-     ["$." monoid]
-     ["$." codec]]]
-   [data
-    ["." bit ("#\." equivalence)]]
-   [math
-    ["." random]]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [\\spec
+      ["$." equivalence]
+      ["$." hash]
+      ["$." order]
+      ["$." enum]
+      ["$." interval]
+      ["$." monoid]
+      ["$." codec]]]
+    [data
+     ["." bit ("#\." equivalence)]]
+    [math
+     ["." random]]]]
+  [\\library
    ["." /
     [// (#+ hex)
      ["n" nat]