12 files changed, 417 insertions, 417 deletions
diff --git a/stdlib/source/test/aedifex/artifact/extension.lux b/stdlib/source/test/aedifex/artifact/extension.lux
index d1f1c4dea..b71b0c001 100644
--- a/stdlib/source/test/aedifex/artifact/extension.lux
+++ b/stdlib/source/test/aedifex/artifact/extension.lux
@@ -1,43 +1,43 @@
 (.using
-  [library
-   [lux "*"
-    ["_" test {"+" Test}]
-    [abstract
-     [monad {"+" do}]]
-    [data
-     ["[0]" text ("[1]#[0]" equivalence)]
-     [collection
-      ["[0]" set]
-      ["[0]" list]]]
-    [math
-     ["[0]" random {"+" Random}]
-     [number
-      ["n" nat]]]]]
-  [\\program
-   ["[0]" /
-    ["/[1]" // "_"
-     ["[1]" type]]]])
+ [library
+  [lux "*"
+   ["_" test {"+" Test}]
+   [abstract
+    [monad {"+" do}]]
+   [data
+    ["[0]" text ("[1]#[0]" equivalence)]
+    [collection
+     ["[0]" set]
+     ["[0]" list]]]
+   [math
+    ["[0]" random {"+" Random}]
+    [number
+     ["n" nat]]]]]
+ [\\program
+  ["[0]" /
+   ["/[1]" // "_"
+    ["[1]" type]]]])
 
 (def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Extension]
-             ($_ _.and
-                 (_.cover [/.lux_library /.jvm_library /.pom
-                           /.sha-1 /.md5]
-                          (let [options (list /.lux_library /.jvm_library /.pom /.sha-1 /.md5)
-                                uniques (set.of_list text.hash options)]
-                            (n.= (list.size options)
-                                 (set.size uniques))))
-                 (_.cover [/.extension /.type]
-                          (`` (and (~~ (template [<type> <extension>]
-                                         [(and (text#= <extension>
-                                                       (/.extension <type>))
-                                               (text#= <type>
-                                                       (/.type (/.extension <type>))))]
+             (all _.and
+                  (_.cover [/.lux_library /.jvm_library /.pom
+                            /.sha-1 /.md5]
+                           (let [options (list /.lux_library /.jvm_library /.pom /.sha-1 /.md5)
+                                 uniques (set.of_list text.hash options)]
+                             (n.= (list.size options)
+                                  (set.size uniques))))
+                  (_.cover [/.extension /.type]
+                           (`` (and (~~ (template [<type> <extension>]
+                                          [(and (text#= <extension>
+                                                        (/.extension <type>))
+                                                (text#= <type>
+                                                        (/.type (/.extension <type>))))]
 
-                                         [//.lux_library /.lux_library]
-                                         [//.jvm_library /.jvm_library]
-                                         [//.pom /.pom]
-                                         )))))
-                 ))))
+                                          [//.lux_library /.lux_library]
+                                          [//.jvm_library /.jvm_library]
+                                          [//.pom /.pom]
+                                          )))))
+                  ))))
diff --git a/stdlib/source/test/aedifex/artifact/snapshot.lux b/stdlib/source/test/aedifex/artifact/snapshot.lux
index b2c6417b1..cea873a6e 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot.lux
@@ -1,24 +1,24 @@
 (.using
-  [library
-   [lux "*"
-    ["_" test {"+" Test}]
-    [abstract
-     [monad {"+" do}]
-     [\\specification
-      ["$[0]" equivalence]]]
-    [control
-     ["[0]" try ("[1]#[0]" functor)]
-     [parser
-      ["<[0]>" xml]]]
-    [math
-     ["[0]" random {"+" Random} ("[1]#[0]" monad)]]]]
-  ["$[0]" / "_"
-   ["[1][0]" build]
-   ["[1][0]" stamp]
-   ["[1][0]" time]
-   ["[1][0]" version]]
-  [\\program
-   ["[0]" /]])
+ [library
+  [lux "*"
+   ["_" test {"+" Test}]
+   [abstract
+    [monad {"+" do}]
+    [\\specification
+     ["$[0]" equivalence]]]
+   [control
+    ["[0]" try ("[1]#[0]" functor)]
+    [parser
+     ["<[0]>" xml]]]
+   [math
+    ["[0]" random {"+" Random} ("[1]#[0]" monad)]]]]
+ ["$[0]" / "_"
+  ["[1][0]" build]
+  ["[1][0]" stamp]
+  ["[1][0]" time]
+  ["[1][0]" version]]
+ [\\program
+  ["[0]" /]])
 
 (def: .public random
   (Random /.Snapshot)
@@ -29,22 +29,22 @@
   Test
   (<| (_.covering /._)
       (_.for [/.Snapshot]
-             ($_ _.and
-                 (_.for [/.equivalence]
-                        ($equivalence.spec /.equivalence ..random))
-                 
-                 (do random.monad
-                   [expected ..random]
-                   (_.cover [/.format /.parser]
-                            (|> expected
-                                /.format
-                                list
-                                (<xml>.result /.parser)
-                                (try#each (# /.equivalence = expected))
-                                (try.else false))))
+             (all _.and
+                  (_.for [/.equivalence]
+                         ($equivalence.spec /.equivalence ..random))
+                  
+                  (do random.monad
+                    [expected ..random]
+                    (_.cover [/.format /.parser]
+                             (|> expected
+                                 /.format
+                                 list
+                                 (<xml>.result /.parser)
+                                 (try#each (# /.equivalence = expected))
+                                 (try.else false))))
 
-                 $/build.test
-                 $/stamp.test
-                 $/time.test
-                 $/version.test
-                 ))))
+                  $/build.test
+                  $/stamp.test
+                  $/time.test
+                  $/version.test
+                  ))))
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/build.lux b/stdlib/source/test/aedifex/artifact/snapshot/build.lux
index 0f3ca9799..b03fe7f10 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/build.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/build.lux
@@ -1,19 +1,19 @@
 (.using
-  [library
-   [lux "*"
-    ["_" test {"+" Test}]
-    [abstract
-     [monad {"+" do}]
-     [\\specification
-      ["$[0]" equivalence]]]
-    [control
-     ["[0]" try ("[1]#[0]" functor)]
-     [parser
-      ["<[0]>" xml]]]
-    [math
-     ["[0]" random {"+" Random}]]]]
-  [\\program
-   ["[0]" /]])
+ [library
+  [lux "*"
+   ["_" test {"+" Test}]
+   [abstract
+    [monad {"+" do}]
+    [\\specification
+     ["$[0]" equivalence]]]
+   [control
+    ["[0]" try ("[1]#[0]" functor)]
+    [parser
+     ["<[0]>" xml]]]
+   [math
+    ["[0]" random {"+" Random}]]]]
+ [\\program
+  ["[0]" /]])
 
 (def: .public random
   (Random /.Build)
@@ -23,17 +23,17 @@
   Test
   (<| (_.covering /._)
       (_.for [/.Build]
-             ($_ _.and
-                 (_.for [/.equivalence]
-                        ($equivalence.spec /.equivalence ..random))
-                 
-                 (do random.monad
-                   [expected ..random]
-                   (_.cover [/.format /.parser]
-                            (|> expected
-                                /.format
-                                list
-                                (<xml>.result /.parser)
-                                (try#each (# /.equivalence = expected))
-                                (try.else false))))
-                 ))))
+             (all _.and
+                  (_.for [/.equivalence]
+                         ($equivalence.spec /.equivalence ..random))
+                  
+                  (do random.monad
+                    [expected ..random]
+                    (_.cover [/.format /.parser]
+                             (|> expected
+                                 /.format
+                                 list
+                                 (<xml>.result /.parser)
+                                 (try#each (# /.equivalence = expected))
+                                 (try.else false))))
+                  ))))
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux b/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux
index 3fa32fe46..181e39523 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux
@@ -1,46 +1,46 @@
 (.using
-  [library
-   [lux "*"
-    ["_" test {"+" Test}]
-    [abstract
-     [monad {"+" do}]
-     [\\specification
-      ["$[0]" equivalence]]]
-    [control
-     ["[0]" try ("[1]#[0]" functor)]
-     [parser
-      ["<[0]>" xml]]]
-    [math
-     ["[0]" random {"+" Random}]]
-    [time
-     ["[0]" instant]]]]
-  [\\program
-   ["[0]" /]]
-  ["$[0]" // "_"
-   ["[1][0]" time]
-   ["[1][0]" build]])
+ [library
+  [lux "*"
+   ["_" test {"+" Test}]
+   [abstract
+    [monad {"+" do}]
+    [\\specification
+     ["$[0]" equivalence]]]
+   [control
+    ["[0]" try ("[1]#[0]" functor)]
+    [parser
+     ["<[0]>" xml]]]
+   [math
+    ["[0]" random {"+" Random}]]
+   [time
+    ["[0]" instant]]]]
+ [\\program
+  ["[0]" /]]
+ ["$[0]" // "_"
+  ["[1][0]" time]
+  ["[1][0]" build]])
 
 (def: .public random
   (Random /.Stamp)
-  ($_ random.and
-      $//time.random
-      $//build.random
-      ))
+  (all random.and
+       $//time.random
+       $//build.random
+       ))
 
 (def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Stamp])
-      ($_ _.and
-          (_.for [/.equivalence]
-                 ($equivalence.spec /.equivalence ..random))
+      (all _.and
+           (_.for [/.equivalence]
+                  ($equivalence.spec /.equivalence ..random))
 
-          (do random.monad
-            [expected ..random]
-            (_.cover [/.format /.parser]
-                     (|> expected
-                         /.format
-                         (<xml>.result /.parser)
-                         (try#each (# /.equivalence = expected))
-                         (try.else false))))
-          )))
+           (do random.monad
+             [expected ..random]
+             (_.cover [/.format /.parser]
+                      (|> expected
+                          /.format
+                          (<xml>.result /.parser)
+                          (try#each (# /.equivalence = expected))
+                          (try.else false))))
+           )))
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/time.lux b/stdlib/source/test/aedifex/artifact/snapshot/time.lux
index b48a8265f..4e8a63fe5 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/time.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/time.lux
@@ -1,21 +1,21 @@
 (.using
-  [library
-   [lux "*"
-    ["_" test {"+" Test}]
-    [abstract
-     [monad {"+" do}]
-     [\\specification
-      ["$[0]" equivalence]]]
-    [control
-     ["[0]" try ("[1]#[0]" functor)]
-     [parser
-      ["<[0]>" text]]]
-    [math
-     ["[0]" random {"+" Random}]]]]
-  [\\program
-   ["[0]" /]]
-  ["$[0]" /// "_"
-   ["[1][0]" time]])
+ [library
+  [lux "*"
+   ["_" test {"+" Test}]
+   [abstract
+    [monad {"+" do}]
+    [\\specification
+     ["$[0]" equivalence]]]
+   [control
+    ["[0]" try ("[1]#[0]" functor)]
+    [parser
+     ["<[0]>" text]]]
+   [math
+    ["[0]" random {"+" Random}]]]]
+ [\\program
+  ["[0]" /]]
+ ["$[0]" /// "_"
+  ["[1][0]" time]])
 
 (def: .public random
   (Random /.Time)
@@ -25,18 +25,18 @@
   Test
   (<| (_.covering /._)
       (_.for [/.Time])
-      ($_ _.and
-          (_.for [/.equivalence]
-                 ($equivalence.spec /.equivalence ..random))
+      (all _.and
+           (_.for [/.equivalence]
+                  ($equivalence.spec /.equivalence ..random))
 
-          (do random.monad
-            [expected ..random]
-            ($_ _.and
-                (_.cover [/.format /.parser]
-                         (|> expected
-                             /.format
-                             (<text>.result /.parser)
-                             (try#each (# /.equivalence = expected))
-                             (try.else false)))
-                ))
-          )))
+           (do random.monad
+             [expected ..random]
+             (all _.and
+                  (_.cover [/.format /.parser]
+                           (|> expected
+                               /.format
+                               (<text>.result /.parser)
+                               (try#each (# /.equivalence = expected))
+                               (try.else false)))
+                  ))
+           )))
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/version.lux b/stdlib/source/test/aedifex/artifact/snapshot/version.lux
index 1f83c119d..1d32ff734 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/version.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/version.lux
@@ -1,50 +1,50 @@
 (.using
-  [library
-   [lux "*"
-    ["_" test {"+" Test}]
-    [abstract
-     [monad {"+" do}]
-     [\\specification
-      ["$[0]" equivalence]]]
-    [control
-     ["[0]" try ("[1]#[0]" functor)]
-     [parser
-      ["<[0]>" xml]]]
-    [math
-     ["[0]" random {"+" Random}]]]]
-  [\\program
-   ["[0]" /]]
-  ["[0]" / "_"
-   ["[1][0]" value]]
-  ["$[0]" /// "_"
-   ["[1][0]" type]
-   ["[1][0]" time]])
+ [library
+  [lux "*"
+   ["_" test {"+" Test}]
+   [abstract
+    [monad {"+" do}]
+    [\\specification
+     ["$[0]" equivalence]]]
+   [control
+    ["[0]" try ("[1]#[0]" functor)]
+    [parser
+     ["<[0]>" xml]]]
+   [math
+    ["[0]" random {"+" Random}]]]]
+ [\\program
+  ["[0]" /]]
+ ["[0]" / "_"
+  ["[1][0]" value]]
+ ["$[0]" /// "_"
+  ["[1][0]" type]
+  ["[1][0]" time]])
 
 (def: .public random
   (Random /.Version)
-  ($_ random.and
-      $///type.random
-      (random.ascii/alpha 1)
-      $///time.random
-      ))
+  (all random.and
+       $///type.random
+       (random.ascii/alpha 1)
+       $///time.random
+       ))
 
 (def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Version])
-      ($_ _.and
-          (_.for [/.equivalence]
-                 ($equivalence.spec /.equivalence ..random))
+      (all _.and
+           (_.for [/.equivalence]
+                  ($equivalence.spec /.equivalence ..random))
 
-          (do random.monad
-            [expected ..random]
-            (_.cover [/.format /.parser]
-                     (|> expected
-                         /.format
-                         list
-                         (<xml>.result /.parser)
-                         (try#each (# /.equivalence = expected))
-                         (try.else false))))
+           (do random.monad
+             [expected ..random]
+             (_.cover [/.format /.parser]
+                      (|> expected
+                          /.format
+                          list
+                          (<xml>.result /.parser)
+                          (try#each (# /.equivalence = expected))
+                          (try.else false))))
 
-          /value.test
-          )))
+           /value.test
+           )))
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux b/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux
index fba89a430..7967e935f 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux
@@ -30,37 +30,37 @@
 
 (def: .public random
   (Random /.Value)
-  ($_ random.and
-      (random.ascii/alpha 5)
-      (random.or (random#in [])
-                 $///stamp.random)
-      ))
+  (all random.and
+       (random.ascii/alpha 5)
+       (random.or (random#in [])
+                  $///stamp.random)
+       ))
 
 (def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Value])
-      ($_ _.and
-          (_.for [/.equivalence]
-                 ($equivalence.spec /.equivalence ..random))
+      (all _.and
+           (_.for [/.equivalence]
+                  ($equivalence.spec /.equivalence ..random))
 
-          (do random.monad
-            [sample random
-             stamp $///stamp.random]
-            (let [version (the /.#version sample)
+           (do random.monad
+             [sample random
+              stamp $///stamp.random]
+             (let [version (the /.#version sample)
 
-                  local!
-                  (text#= version
-                          (/.format (has /.#snapshot {///.#Local} sample)))
+                   local!
+                   (text#= version
+                           (/.format (has /.#snapshot {///.#Local} sample)))
 
-                  remote_format (/.format [/.#version (format version /.snapshot)
-                                           /.#snapshot {///.#Remote stamp}])
-                  remote!
-                  (and (text.starts_with? (format version (///time.format (the ///stamp.#time stamp)))
-                                          remote_format)
-                       (text.ends_with? (%.nat (the ///stamp.#build stamp))
-                                        remote_format))]
-              (_.cover [/.snapshot /.format]
-                       (and local!
-                            remote!))))
-          )))
+                   remote_format (/.format [/.#version (format version /.snapshot)
+                                            /.#snapshot {///.#Remote stamp}])
+                   remote!
+                   (and (text.starts_with? (format version (///time.format (the ///stamp.#time stamp)))
+                                           remote_format)
+                        (text.ends_with? (%.nat (the ///stamp.#build stamp))
+                                         remote_format))]
+               (_.cover [/.snapshot /.format]
+                        (and local!
+                             remote!))))
+           )))
diff --git a/stdlib/source/test/aedifex/artifact/time.lux b/stdlib/source/test/aedifex/artifact/time.lux
index 671fbfdfa..d8f67e45a 100644
--- a/stdlib/source/test/aedifex/artifact/time.lux
+++ b/stdlib/source/test/aedifex/artifact/time.lux
@@ -1,26 +1,26 @@
 (.using
-  [library
-   [lux "*"
-    ["_" test {"+" Test}]
-    [abstract
-     [monad {"+" do}]
-     [\\specification
-      ["$[0]" equivalence]]]
-    [control
-     ["[0]" try ("[1]#[0]" functor)]
-     [parser
-      ["<[0]>" text]]]
-    [time
-     ["[0]" instant ("[1]#[0]" equivalence)]]
-    [math
-     ["[0]" random {"+" Random}]
-     [number
-      ["i" int]]]]]
-  [\\program
-   ["[0]" /]]
-  ["[0]" / "_"
-   ["[1][0]" date]
-   ["[1][0]" time]])
+ [library
+  [lux "*"
+   ["_" test {"+" Test}]
+   [abstract
+    [monad {"+" do}]
+    [\\specification
+     ["$[0]" equivalence]]]
+   [control
+    ["[0]" try ("[1]#[0]" functor)]
+    [parser
+     ["<[0]>" text]]]
+   [time
+    ["[0]" instant ("[1]#[0]" equivalence)]]
+   [math
+    ["[0]" random {"+" Random}]
+    [number
+     ["i" int]]]]]
+ [\\program
+  ["[0]" /]]
+ ["[0]" / "_"
+  ["[1][0]" date]
+  ["[1][0]" time]])
 
 (def: .public random
   (Random /.Time)
@@ -33,29 +33,29 @@
   Test
   (<| (_.covering /._)
       (_.for [/.Time])
-      ($_ _.and
-          (_.for [/.equivalence]
-                 ($equivalence.spec /.equivalence ..random))
+      (all _.and
+           (_.for [/.equivalence]
+                  ($equivalence.spec /.equivalence ..random))
 
-          (do random.monad
-            [expected ..random]
-            (_.cover [/.format /.parser]
-                     (|> expected
-                         /.format
-                         (<text>.result /.parser)
-                         (try#each (# /.equivalence = expected))
-                         (try.else false))))
-          (do random.monad
-            [expected ..random]
-            (_.cover [/.instant /.of_instant]
-                     (|> expected
-                         /.instant
-                         /.of_instant
-                         (try#each (# /.equivalence = expected))
-                         (try.else false))))
-          (_.cover [/.epoch]
-                   (instant#= instant.epoch (/.instant /.epoch)))
+           (do random.monad
+             [expected ..random]
+             (_.cover [/.format /.parser]
+                      (|> expected
+                          /.format
+                          (<text>.result /.parser)
+                          (try#each (# /.equivalence = expected))
+                          (try.else false))))
+           (do random.monad
+             [expected ..random]
+             (_.cover [/.instant /.of_instant]
+                      (|> expected
+                          /.instant
+                          /.of_instant
+                          (try#each (# /.equivalence = expected))
+                          (try.else false))))
+           (_.cover [/.epoch]
+                    (instant#= instant.epoch (/.instant /.epoch)))
 
-          /date.test
-          /time.test
-          )))
+           /date.test
+           /time.test
+           )))
diff --git a/stdlib/source/test/aedifex/artifact/time/date.lux b/stdlib/source/test/aedifex/artifact/time/date.lux
index dfca44e0d..9f5169d78 100644
--- a/stdlib/source/test/aedifex/artifact/time/date.lux
+++ b/stdlib/source/test/aedifex/artifact/time/date.lux
@@ -1,26 +1,26 @@
 (.using
-  [library
-   [lux "*"
-    ["_" test {"+" Test}]
-    [abstract
-     [monad {"+" do}]
-     [\\specification
-      ["$[0]" equivalence]]]
-    [control
-     ["[0]" try ("[1]#[0]" functor)]
-     ["[0]" exception]
-     [parser
-      ["<[0]>" text]]]
-    [math
-     ["[0]" random {"+" Random}]
-     [number
-      ["n" nat]
-      ["i" int]]]
-    [time
-     ["[0]" date ("[1]#[0]" equivalence)]
-     ["[0]" year]]]]
-  [\\program
-   ["[0]" /]])
+ [library
+  [lux "*"
+   ["_" test {"+" Test}]
+   [abstract
+    [monad {"+" do}]
+    [\\specification
+     ["$[0]" equivalence]]]
+   [control
+    ["[0]" try ("[1]#[0]" functor)]
+    ["[0]" exception]
+    [parser
+     ["<[0]>" text]]]
+   [math
+    ["[0]" random {"+" Random}]
+    [number
+     ["n" nat]
+     ["i" int]]]
+   [time
+    ["[0]" date ("[1]#[0]" equivalence)]
+    ["[0]" year]]]]
+ [\\program
+  ["[0]" /]])
 
 (def: .public random
   (Random /.Date)
@@ -41,29 +41,29 @@
       (do random.monad
         [expected ..random
          candidate random.date]
-        ($_ _.and
-            (_.for [/.equivalence]
-                   ($equivalence.spec /.equivalence ..random))
+        (all _.and
+             (_.for [/.equivalence]
+                    ($equivalence.spec /.equivalence ..random))
 
-            (_.cover [/.format /.parser]
-                     (|> expected
-                         /.format
-                         (<text>.result /.parser)
-                         (try#each (# /.equivalence = expected))
-                         (try.else false)))
-            (_.cover [/.value /.date]
-                     (|> expected
-                         /.value
-                         /.date
-                         (try#each (# /.equivalence = expected))
-                         (try.else false)))
-            (_.cover [/.year_is_out_of_range]
-                     (case (/.date candidate)
-                       {try.#Success date}
-                       (same? candidate (/.value date))
-                       
-                       {try.#Failure error}
-                       (exception.match? /.year_is_out_of_range error)))
-            (_.cover [/.epoch]
-                     (date#= date.epoch (/.value /.epoch)))
-            ))))
+             (_.cover [/.format /.parser]
+                      (|> expected
+                          /.format
+                          (<text>.result /.parser)
+                          (try#each (# /.equivalence = expected))
+                          (try.else false)))
+             (_.cover [/.value /.date]
+                      (|> expected
+                          /.value
+                          /.date
+                          (try#each (# /.equivalence = expected))
+                          (try.else false)))
+             (_.cover [/.year_is_out_of_range]
+                      (case (/.date candidate)
+                        {try.#Success date}
+                        (same? candidate (/.value date))
+                        
+                        {try.#Failure error}
+                        (exception.match? /.year_is_out_of_range error)))
+             (_.cover [/.epoch]
+                      (date#= date.epoch (/.value /.epoch)))
+             ))))
diff --git a/stdlib/source/test/aedifex/artifact/time/time.lux b/stdlib/source/test/aedifex/artifact/time/time.lux
index 64155f029..da0589d93 100644
--- a/stdlib/source/test/aedifex/artifact/time/time.lux
+++ b/stdlib/source/test/aedifex/artifact/time/time.lux
@@ -28,13 +28,13 @@
   Test
   (<| (_.covering /._)
       (_.for [/.Time])
-      ($_ _.and
-          (do random.monad
-            [expected ..random]
-            (_.cover [/.format /.parser]
-                     (|> expected
-                         /.format
-                         (<text>.result /.parser)
-                         (try#each (# time.equivalence = expected))
-                         (try.else false))))
-          )))
+      (all _.and
+           (do random.monad
+             [expected ..random]
+             (_.cover [/.format /.parser]
+                      (|> expected
+                          /.format
+                          (<text>.result /.parser)
+                          (try#each (# time.equivalence = expected))
+                          (try.else false))))
+           )))
diff --git a/stdlib/source/test/aedifex/artifact/type.lux b/stdlib/source/test/aedifex/artifact/type.lux
index 41f3510e7..a5592e3ef 100644
--- a/stdlib/source/test/aedifex/artifact/type.lux
+++ b/stdlib/source/test/aedifex/artifact/type.lux
@@ -1,43 +1,43 @@
 (.using
-  [library
-   [lux "*"
-    ["_" test {"+" Test}]
-    [abstract
-     [monad {"+" do}]]
-    [data
-     ["[0]" text]
-     [collection
-      ["[0]" set]
-      ["[0]" list]]]
-    [math
-     ["[0]" random {"+" Random} ("[1]#[0]" monad)]
-     [number
-      ["n" nat]]]]]
-  [\\program
-   ["[0]" /]])
+ [library
+  [lux "*"
+   ["_" test {"+" Test}]
+   [abstract
+    [monad {"+" do}]]
+   [data
+    ["[0]" text]
+    [collection
+     ["[0]" set]
+     ["[0]" list]]]
+   [math
+    ["[0]" random {"+" Random} ("[1]#[0]" monad)]
+    [number
+     ["n" nat]]]]]
+ [\\program
+  ["[0]" /]])
 
 (def: .public random
   (Random /.Type)
-  ($_ random.either
-      ($_ random.either
-          (random#in /.lux_library)
-          (random#in /.jvm_library))
-      ($_ random.either
-          (random#in /.pom)
-          (random#in /.md5)
-          (random#in /.sha-1))
-      ))
+  (all random.either
+       (all random.either
+            (random#in /.lux_library)
+            (random#in /.jvm_library))
+       (all random.either
+            (random#in /.pom)
+            (random#in /.md5)
+            (random#in /.sha-1))
+       ))
 
 (def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Type]
-             ($_ _.and
-                 (_.cover [/.lux_library /.jvm_library /.js_library
-                           /.pom /.md5 /.sha-1]
-                          (let [options (list /.lux_library /.jvm_library /.js_library
-                                              /.pom /.md5 /.sha-1)
-                                uniques (set.of_list text.hash options)]
-                            (n.= (list.size options)
-                                 (set.size uniques))))
-                 ))))
+             (all _.and
+                  (_.cover [/.lux_library /.jvm_library /.js_library
+                            /.pom /.md5 /.sha-1]
+                           (let [options (list /.lux_library /.jvm_library /.js_library
+                                               /.pom /.md5 /.sha-1)
+                                 uniques (set.of_list text.hash options)]
+                             (n.= (list.size options)
+                                  (set.size uniques))))
+                  ))))
diff --git a/stdlib/source/test/aedifex/artifact/versioning.lux b/stdlib/source/test/aedifex/artifact/versioning.lux
index 5a14e9638..bc029a46a 100644
--- a/stdlib/source/test/aedifex/artifact/versioning.lux
+++ b/stdlib/source/test/aedifex/artifact/versioning.lux
@@ -1,54 +1,54 @@
 (.using
-  [library
-   [lux "*"
-    ["_" test {"+" Test}]
-    [abstract
-     [monad {"+" do}]
-     [\\specification
-      ["$[0]" equivalence]]]
-    [control
-     ["[0]" try ("[1]#[0]" functor)]
-     [parser
-      ["<[0]>" xml]]]
-    [math
-     ["[0]" random {"+" Random}]]]]
-  [\\program
-   ["[0]" /]]
-  ["$[0]" // "_"
-   ["[1][0]" time]
-   ["[1][0]" snapshot
-    ["[1]/[0]" version]]])
+ [library
+  [lux "*"
+   ["_" test {"+" Test}]
+   [abstract
+    [monad {"+" do}]
+    [\\specification
+     ["$[0]" equivalence]]]
+   [control
+    ["[0]" try ("[1]#[0]" functor)]
+    [parser
+     ["<[0]>" xml]]]
+   [math
+    ["[0]" random {"+" Random}]]]]
+ [\\program
+  ["[0]" /]]
+ ["$[0]" // "_"
+  ["[1][0]" time]
+  ["[1][0]" snapshot
+   ["[1]/[0]" version]]])
 
 (def: .public random
   (Random /.Versioning)
-  ($_ random.and
-      $//snapshot.random
-      $//time.random
-      (random.list 5 $//snapshot/version.random)
-      ))
+  (all random.and
+       $//snapshot.random
+       $//time.random
+       (random.list 5 $//snapshot/version.random)
+       ))
 
 (def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Versioning])
-      ($_ _.and
-          (_.for [/.equivalence]
-                 ($equivalence.spec /.equivalence ..random))
-          
-          (do random.monad
-            [expected ..random]
-            (_.cover [/.format /.parser]
-                     (|> expected
-                         /.format
-                         list
-                         (<xml>.result /.parser)
-                         (try#each (# /.equivalence = expected))
-                         (try.else false))))
-          (_.cover [/.init]
-                   (|> /.init
-                       /.format
-                       list
-                       (<xml>.result /.parser)
-                       (try#each (# /.equivalence = /.init))
-                       (try.else false)))
-          )))
+      (all _.and
+           (_.for [/.equivalence]
+                  ($equivalence.spec /.equivalence ..random))
+           
+           (do random.monad
+             [expected ..random]
+             (_.cover [/.format /.parser]
+                      (|> expected
+                          /.format
+                          list
+                          (<xml>.result /.parser)
+                          (try#each (# /.equivalence = expected))
+                          (try.else false))))
+           (_.cover [/.init]
+                    (|> /.init
+                        /.format
+                        list
+                        (<xml>.result /.parser)
+                        (try#each (# /.equivalence = /.init))
+                        (try.else false)))
+           )))