4 files changed, 89 insertions, 85 deletions
diff --git a/stdlib/source/test/lux/macro/poly.lux b/stdlib/source/test/lux/macro/poly.lux
index d15e96d3d..90c57c87c 100644
--- a/stdlib/source/test/lux/macro/poly.lux
+++ b/stdlib/source/test/lux/macro/poly.lux
@@ -1,7 +1,8 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]]
-  [\\
+  [library
+   [lux #*
+    ["_" test (#+ Test)]]]
+  [\\library
    ["." /]]
   ["." / #_
    ["#." equivalence]
diff --git a/stdlib/source/test/lux/macro/poly/equivalence.lux b/stdlib/source/test/lux/macro/poly/equivalence.lux
index a43da2d84..c8cd7c7bf 100644
--- a/stdlib/source/test/lux/macro/poly/equivalence.lux
+++ b/stdlib/source/test/lux/macro/poly/equivalence.lux
@@ -1,27 +1,28 @@
 (.module:
-  [lux #*
-   ["%" data/text/format (#+ format)]
-   ["_" test (#+ Test)]
-   [abstract
-    [monad (#+ do)]
-    [equivalence (#+ Equivalence)
-     [\poly
-      ["." /]]]
-    [\spec
-     ["$." equivalence]]]
-   [data
-    ["." bit]
-    ["." maybe]
-    ["." text]
-    [collection
-     ["." list]]]
-   [macro
-    [poly (#+ derived:)]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]
-     ["i" int]]]])
+  [library
+   [lux #*
+    ["%" data/text/format (#+ format)]
+    ["_" test (#+ Test)]
+    [abstract
+     [monad (#+ do)]
+     [equivalence (#+ Equivalence)
+      [\\poly
+       ["." /]]]
+     [\\spec
+      ["$." equivalence]]]
+    [data
+     ["." bit]
+     ["." maybe]
+     ["." text]
+     [collection
+      ["." list]]]
+    [macro
+     [poly (#+ derived:)]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]
+      ["i" int]]]]])
 
 (type: Variant
   (#Case0 Bit)
diff --git a/stdlib/source/test/lux/macro/poly/functor.lux b/stdlib/source/test/lux/macro/poly/functor.lux
index 8d94cf852..6eebf2d55 100644
--- a/stdlib/source/test/lux/macro/poly/functor.lux
+++ b/stdlib/source/test/lux/macro/poly/functor.lux
@@ -1,19 +1,20 @@
 (.module:
-  [lux #*
-   ["%" data/text/format (#+ format)]
-   [abstract
-    [monad (#+ do)]
-    [functor
-     [\poly
-      ["." /]]]]
-   ["r" math/random (#+ Random)]
-   ["_" test (#+ Test)]
-   [control
-    ["." state]]
-   [data
-    ["." identity]]
-   [macro
-    [poly (#+ derived:)]]])
+  [library
+   [lux #*
+    ["%" data/text/format (#+ format)]
+    [abstract
+     [monad (#+ do)]
+     [functor
+      [\\poly
+       ["." /]]]]
+    ["r" math/random (#+ Random)]
+    ["_" test (#+ Test)]
+    [control
+     ["." state]]
+    [data
+     ["." identity]]
+    [macro
+     [poly (#+ derived:)]]]])
 
 (derived: maybe_functor (/.functor .Maybe))
 (derived: list_functor (/.functor .List))
diff --git a/stdlib/source/test/lux/macro/poly/json.lux b/stdlib/source/test/lux/macro/poly/json.lux
index 91ad9b010..e369dac92 100644
--- a/stdlib/source/test/lux/macro/poly/json.lux
+++ b/stdlib/source/test/lux/macro/poly/json.lux
@@ -1,48 +1,49 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
-   ["." debug]
-   [abstract
-    codec
-    [monad (#+ do)]
-    ["." equivalence (#+ Equivalence)
-     ["poly/#" \poly]]
-    [\spec
-     ["$." equivalence]
-     ["$." codec]]]
-   [control
-    pipe
-    ["." try]
-    ["p" parser
-     ## TODO: Get rid of this import ASAP
-     [json (#+)]]]
-   [data
-    ["." bit]
-    ["." maybe]
-    ["." text
-     ["%" format (#+ format)]]
-    [format
-     [json (#+)
-      [\poly
-       ["." /]]]]
-    [collection
-     [row (#+ row)]
-     ["d" dictionary]
-     ["." list]]]
-   [macro
-    [poly (#+ derived:)]]
-   [type
-    ["." unit]]
-   [math
-    ["." random (#+ Random)]
-    [number
-     ["n" nat]
-     ["." frac]]]
-   [time
-    ["ti" instant]
-    ["tda" date]
-    ## ["tdu" duration]
-    ]]
+  [library
+   [lux #*
+    ["_" test (#+ Test)]
+    ["." debug]
+    [abstract
+     codec
+     [monad (#+ do)]
+     ["." equivalence (#+ Equivalence)
+      ["poly/#" \\poly]]
+     [\\spec
+      ["$." equivalence]
+      ["$." codec]]]
+    [control
+     pipe
+     ["." try]
+     ["p" parser
+      ## TODO: Get rid of this import ASAP
+      [json (#+)]]]
+    [data
+     ["." bit]
+     ["." maybe]
+     ["." text
+      ["%" format (#+ format)]]
+     [format
+      [json (#+)
+       [\\poly
+        ["." /]]]]
+     [collection
+      [row (#+ row)]
+      ["d" dictionary]
+      ["." list]]]
+    [macro
+     [poly (#+ derived:)]]
+    [type
+     ["." unit]]
+    [math
+     ["." random (#+ Random)]
+     [number
+      ["n" nat]
+      ["." frac]]]
+    [time
+     ["ti" instant]
+     ["tda" date]
+     ## ["tdu" duration]
+     ]]]
   [test
    [lux
     [time