From f621a133e6e0a516c0586270fea8eaffb4829d82 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sun, 8 Aug 2021 17:56:15 -0400
Subject: No more #export magic syntax.

---
 stdlib/source/test/aedifex/artifact.lux            |  4 +-
 stdlib/source/test/aedifex/artifact/extension.lux  |  2 +-
 stdlib/source/test/aedifex/artifact/snapshot.lux   |  4 +-
 .../test/aedifex/artifact/snapshot/build.lux       |  4 +-
 .../test/aedifex/artifact/snapshot/stamp.lux       |  4 +-
 .../source/test/aedifex/artifact/snapshot/time.lux |  4 +-
 .../test/aedifex/artifact/snapshot/version.lux     |  4 +-
 .../aedifex/artifact/snapshot/version/value.lux    |  4 +-
 stdlib/source/test/aedifex/artifact/time.lux       |  4 +-
 stdlib/source/test/aedifex/artifact/time/date.lux  |  4 +-
 stdlib/source/test/aedifex/artifact/time/time.lux  |  4 +-
 stdlib/source/test/aedifex/artifact/type.lux       |  4 +-
 stdlib/source/test/aedifex/artifact/versioning.lux |  4 +-
 stdlib/source/test/aedifex/cache.lux               |  2 +-
 stdlib/source/test/aedifex/cli.lux                 |  2 +-
 stdlib/source/test/aedifex/command.lux             |  2 +-
 stdlib/source/test/aedifex/command/auto.lux        |  2 +-
 stdlib/source/test/aedifex/command/build.lux       | 10 ++---
 stdlib/source/test/aedifex/command/clean.lux       |  2 +-
 stdlib/source/test/aedifex/command/deploy.lux      |  2 +-
 stdlib/source/test/aedifex/command/deps.lux        |  2 +-
 stdlib/source/test/aedifex/command/install.lux     |  4 +-
 stdlib/source/test/aedifex/command/pom.lux         |  2 +-
 stdlib/source/test/aedifex/command/test.lux        |  2 +-
 stdlib/source/test/aedifex/command/version.lux     |  6 +--
 stdlib/source/test/aedifex/dependency.lux          |  4 +-
 .../source/test/aedifex/dependency/deployment.lux  |  2 +-
 .../source/test/aedifex/dependency/resolution.lux  |  6 +--
 stdlib/source/test/aedifex/dependency/status.lux   |  4 +-
 stdlib/source/test/aedifex/hash.lux                |  4 +-
 stdlib/source/test/aedifex/input.lux               |  2 +-
 stdlib/source/test/aedifex/local.lux               |  2 +-
 stdlib/source/test/aedifex/metadata.lux            |  2 +-
 stdlib/source/test/aedifex/metadata/artifact.lux   |  4 +-
 stdlib/source/test/aedifex/metadata/snapshot.lux   |  4 +-
 stdlib/source/test/aedifex/package.lux             |  4 +-
 stdlib/source/test/aedifex/parser.lux              |  2 +-
 stdlib/source/test/aedifex/pom.lux                 |  2 +-
 stdlib/source/test/aedifex/profile.lux             |  4 +-
 stdlib/source/test/aedifex/project.lux             |  4 +-
 stdlib/source/test/aedifex/repository.lux          |  6 +--
 stdlib/source/test/aedifex/repository/identity.lux |  4 +-
 stdlib/source/test/aedifex/repository/local.lux    |  2 +-
 stdlib/source/test/aedifex/repository/origin.lux   |  4 +-
 stdlib/source/test/aedifex/repository/remote.lux   |  2 +-
 stdlib/source/test/aedifex/runtime.lux             |  4 +-
 stdlib/source/test/lux.lux                         | 21 ++++++---
 stdlib/source/test/lux/abstract.lux                |  2 +-
 stdlib/source/test/lux/abstract/apply.lux          |  2 +-
 stdlib/source/test/lux/abstract/codec.lux          |  2 +-
 stdlib/source/test/lux/abstract/comonad.lux        |  2 +-
 stdlib/source/test/lux/abstract/comonad/cofree.lux |  2 +-
 stdlib/source/test/lux/abstract/enum.lux           |  2 +-
 stdlib/source/test/lux/abstract/equivalence.lux    |  2 +-
 stdlib/source/test/lux/abstract/fold.lux           |  2 +-
 stdlib/source/test/lux/abstract/functor.lux        |  2 +-
 .../test/lux/abstract/functor/contravariant.lux    |  2 +-
 stdlib/source/test/lux/abstract/hash.lux           |  2 +-
 stdlib/source/test/lux/abstract/interval.lux       |  8 ++--
 stdlib/source/test/lux/abstract/monad.lux          |  2 +-
 stdlib/source/test/lux/abstract/monad/free.lux     |  2 +-
 stdlib/source/test/lux/abstract/monoid.lux         |  2 +-
 stdlib/source/test/lux/abstract/order.lux          |  2 +-
 stdlib/source/test/lux/abstract/predicate.lux      |  2 +-
 stdlib/source/test/lux/control.lux                 |  2 +-
 stdlib/source/test/lux/control/concatenative.lux   | 46 +++++++++----------
 .../source/test/lux/control/concurrency/actor.lux  |  4 +-
 .../source/test/lux/control/concurrency/async.lux  |  2 +-
 .../source/test/lux/control/concurrency/atom.lux   |  2 +-
 stdlib/source/test/lux/control/concurrency/frp.lux |  2 +-
 .../test/lux/control/concurrency/semaphore.lux     |  2 +-
 stdlib/source/test/lux/control/concurrency/stm.lux |  2 +-
 .../source/test/lux/control/concurrency/thread.lux |  2 +-
 stdlib/source/test/lux/control/continuation.lux    |  2 +-
 stdlib/source/test/lux/control/exception.lux       |  2 +-
 stdlib/source/test/lux/control/function.lux        |  2 +-
 .../source/test/lux/control/function/contract.lux  |  2 +-
 stdlib/source/test/lux/control/function/memo.lux   |  2 +-
 stdlib/source/test/lux/control/function/mixin.lux  |  2 +-
 stdlib/source/test/lux/control/function/mutual.lux |  2 +-
 stdlib/source/test/lux/control/io.lux              |  2 +-
 stdlib/source/test/lux/control/parser.lux          |  2 +-
 stdlib/source/test/lux/control/parser/analysis.lux | 12 ++---
 stdlib/source/test/lux/control/parser/binary.lux   | 12 ++---
 stdlib/source/test/lux/control/parser/cli.lux      | 14 +++---
 stdlib/source/test/lux/control/parser/code.lux     | 14 +++---
 .../source/test/lux/control/parser/environment.lux |  2 +-
 stdlib/source/test/lux/control/parser/json.lux     | 14 +++---
 .../source/test/lux/control/parser/synthesis.lux   | 14 +++---
 stdlib/source/test/lux/control/parser/text.lux     | 14 +++---
 stdlib/source/test/lux/control/parser/tree.lux     | 50 ++++++++++-----------
 stdlib/source/test/lux/control/parser/type.lux     | 14 +++---
 stdlib/source/test/lux/control/parser/xml.lux      | 32 ++++++-------
 stdlib/source/test/lux/control/pipe.lux            |  2 +-
 stdlib/source/test/lux/control/reader.lux          |  2 +-
 stdlib/source/test/lux/control/region.lux          |  2 +-
 stdlib/source/test/lux/control/remember.lux        |  2 +-
 .../test/lux/control/security/capability.lux       |  2 +-
 stdlib/source/test/lux/control/security/policy.lux |  2 +-
 stdlib/source/test/lux/control/state.lux           |  2 +-
 stdlib/source/test/lux/control/thread.lux          |  2 +-
 stdlib/source/test/lux/control/try.lux             |  4 +-
 stdlib/source/test/lux/control/writer.lux          |  2 +-
 stdlib/source/test/lux/data.lux                    | 10 ++---
 stdlib/source/test/lux/data/binary.lux             |  4 +-
 stdlib/source/test/lux/data/bit.lux                |  2 +-
 stdlib/source/test/lux/data/collection.lux         |  2 +-
 stdlib/source/test/lux/data/collection/array.lux   |  2 +-
 stdlib/source/test/lux/data/collection/bits.lux    |  4 +-
 .../source/test/lux/data/collection/dictionary.lux |  2 +-
 .../lux/data/collection/dictionary/ordered.lux     |  4 +-
 .../test/lux/data/collection/dictionary/plist.lux  |  4 +-
 stdlib/source/test/lux/data/collection/list.lux    |  2 +-
 stdlib/source/test/lux/data/collection/queue.lux   |  2 +-
 .../test/lux/data/collection/queue/priority.lux    |  4 +-
 stdlib/source/test/lux/data/collection/row.lux     |  2 +-
 .../source/test/lux/data/collection/sequence.lux   |  2 +-
 stdlib/source/test/lux/data/collection/set.lux     |  2 +-
 .../source/test/lux/data/collection/set/multi.lux  |  4 +-
 .../test/lux/data/collection/set/ordered.lux       |  4 +-
 stdlib/source/test/lux/data/collection/stack.lux   |  2 +-
 stdlib/source/test/lux/data/collection/tree.lux    |  4 +-
 .../test/lux/data/collection/tree/finger.lux       |  2 +-
 .../test/lux/data/collection/tree/zipper.lux       |  2 +-
 stdlib/source/test/lux/data/color.lux              |  4 +-
 stdlib/source/test/lux/data/color/named.lux        |  2 +-
 stdlib/source/test/lux/data/format/binary.lux      |  2 +-
 stdlib/source/test/lux/data/format/json.lux        |  4 +-
 stdlib/source/test/lux/data/format/tar.lux         |  2 +-
 stdlib/source/test/lux/data/format/xml.lux         |  4 +-
 stdlib/source/test/lux/data/identity.lux           |  2 +-
 stdlib/source/test/lux/data/lazy.lux               |  4 +-
 stdlib/source/test/lux/data/maybe.lux              |  2 +-
 stdlib/source/test/lux/data/name.lux               |  4 +-
 stdlib/source/test/lux/data/product.lux            |  2 +-
 stdlib/source/test/lux/data/sum.lux                |  2 +-
 stdlib/source/test/lux/data/text.lux               |  2 +-
 stdlib/source/test/lux/data/text/buffer.lux        |  2 +-
 stdlib/source/test/lux/data/text/encoding.lux      |  4 +-
 stdlib/source/test/lux/data/text/encoding/utf8.lux |  2 +-
 stdlib/source/test/lux/data/text/escape.lux        |  2 +-
 stdlib/source/test/lux/data/text/format.lux        |  2 +-
 stdlib/source/test/lux/data/text/regex.lux         |  2 +-
 stdlib/source/test/lux/data/text/unicode/block.lux |  4 +-
 stdlib/source/test/lux/data/text/unicode/set.lux   |  4 +-
 stdlib/source/test/lux/debug.lux                   |  2 +-
 stdlib/source/test/lux/extension.lux               |  2 +-
 stdlib/source/test/lux/ffi.js.lux                  |  2 +-
 stdlib/source/test/lux/ffi.jvm.lux                 |  2 +-
 stdlib/source/test/lux/ffi.lua.lux                 |  2 +-
 stdlib/source/test/lux/ffi.old.lux                 |  2 +-
 stdlib/source/test/lux/ffi.php.lux                 |  2 +-
 stdlib/source/test/lux/ffi.py.lux                  |  2 +-
 stdlib/source/test/lux/ffi.rb.lux                  |  2 +-
 stdlib/source/test/lux/ffi.scm.lux                 |  2 +-
 stdlib/source/test/lux/locale.lux                  |  2 +-
 stdlib/source/test/lux/locale/language.lux         | 10 ++---
 stdlib/source/test/lux/locale/territory.lux        | 10 ++---
 stdlib/source/test/lux/macro.lux                   | 14 +++---
 stdlib/source/test/lux/macro/code.lux              |  4 +-
 stdlib/source/test/lux/macro/local.lux             |  2 +-
 stdlib/source/test/lux/macro/poly.lux              |  2 +-
 stdlib/source/test/lux/macro/poly/equivalence.lux  |  2 +-
 stdlib/source/test/lux/macro/poly/functor.lux      |  2 +-
 stdlib/source/test/lux/macro/poly/json.lux         |  2 +-
 stdlib/source/test/lux/macro/syntax.lux            |  2 +-
 .../source/test/lux/macro/syntax/annotations.lux   |  4 +-
 stdlib/source/test/lux/macro/syntax/check.lux      |  4 +-
 .../source/test/lux/macro/syntax/declaration.lux   |  4 +-
 stdlib/source/test/lux/macro/syntax/definition.lux |  4 +-
 stdlib/source/test/lux/macro/syntax/export.lux     |  2 +-
 stdlib/source/test/lux/macro/syntax/input.lux      |  4 +-
 .../source/test/lux/macro/syntax/type/variable.lux |  4 +-
 stdlib/source/test/lux/macro/template.lux          |  2 +-
 stdlib/source/test/lux/math.lux                    |  2 +-
 stdlib/source/test/lux/math/infix.lux              |  2 +-
 stdlib/source/test/lux/math/logic/continuous.lux   |  2 +-
 stdlib/source/test/lux/math/logic/fuzzy.lux        |  2 +-
 stdlib/source/test/lux/math/modular.lux            |  4 +-
 stdlib/source/test/lux/math/modulus.lux            |  4 +-
 stdlib/source/test/lux/math/number.lux             |  2 +-
 stdlib/source/test/lux/math/number/complex.lux     |  4 +-
 stdlib/source/test/lux/math/number/frac.lux        |  2 +-
 stdlib/source/test/lux/math/number/i16.lux         |  4 +-
 stdlib/source/test/lux/math/number/i32.lux         |  4 +-
 stdlib/source/test/lux/math/number/i64.lux         |  2 +-
 stdlib/source/test/lux/math/number/i8.lux          |  4 +-
 stdlib/source/test/lux/math/number/int.lux         |  2 +-
 stdlib/source/test/lux/math/number/nat.lux         |  2 +-
 stdlib/source/test/lux/math/number/ratio.lux       |  4 +-
 stdlib/source/test/lux/math/number/rev.lux         |  2 +-
 stdlib/source/test/lux/meta.lux                    |  8 ++--
 stdlib/source/test/lux/meta/annotation.lux         |  8 ++--
 stdlib/source/test/lux/meta/location.lux           |  4 +-
 stdlib/source/test/lux/program.lux                 |  2 +-
 stdlib/source/test/lux/target.lux                  |  2 +-
 stdlib/source/test/lux/target/jvm.lux              | 52 +++++++++++-----------
 stdlib/source/test/lux/test.lux                    |  4 +-
 stdlib/source/test/lux/time.lux                    |  2 +-
 stdlib/source/test/lux/time/date.lux               |  2 +-
 stdlib/source/test/lux/time/day.lux                |  4 +-
 stdlib/source/test/lux/time/duration.lux           |  2 +-
 stdlib/source/test/lux/time/instant.lux            |  2 +-
 stdlib/source/test/lux/time/month.lux              |  4 +-
 stdlib/source/test/lux/time/year.lux               |  4 +-
 stdlib/source/test/lux/tool.lux                    |  2 +-
 .../tool/compiler/language/lux/phase/analysis.lux  |  2 +-
 .../compiler/language/lux/phase/analysis/case.lux  |  6 +--
 .../language/lux/phase/analysis/function.lux       |  2 +-
 .../language/lux/phase/analysis/primitive.lux      | 12 ++---
 .../language/lux/phase/analysis/reference.lux      |  2 +-
 .../language/lux/phase/analysis/structure.lux      |  4 +-
 .../language/lux/phase/extension/analysis/lux.lux  |  2 +-
 .../tool/compiler/language/lux/phase/synthesis.lux |  2 +-
 .../compiler/language/lux/phase/synthesis/case.lux |  2 +-
 .../language/lux/phase/synthesis/function.lux      |  2 +-
 .../compiler/language/lux/phase/synthesis/loop.lux |  2 +-
 .../language/lux/phase/synthesis/primitive.lux     |  6 +--
 .../language/lux/phase/synthesis/structure.lux     |  2 +-
 .../language/lux/phase/synthesis/variable.lux      |  2 +-
 .../test/lux/tool/compiler/language/lux/syntax.lux |  2 +-
 stdlib/source/test/lux/type.lux                    |  4 +-
 stdlib/source/test/lux/type/abstract.lux           |  6 ++-
 stdlib/source/test/lux/type/check.lux              |  2 +-
 stdlib/source/test/lux/type/dynamic.lux            |  2 +-
 stdlib/source/test/lux/type/implicit.lux           |  2 +-
 stdlib/source/test/lux/type/quotient.lux           |  4 +-
 stdlib/source/test/lux/type/refinement.lux         |  2 +-
 stdlib/source/test/lux/type/resource.lux           |  2 +-
 stdlib/source/test/lux/type/unit.lux               |  2 +-
 stdlib/source/test/lux/type/variance.lux           |  2 +-
 stdlib/source/test/lux/world.lux                   |  2 +-
 stdlib/source/test/lux/world/console.lux           |  2 +-
 stdlib/source/test/lux/world/file.lux              |  2 +-
 stdlib/source/test/lux/world/file/watch.lux        |  2 +-
 stdlib/source/test/lux/world/input/keyboard.lux    |  4 +-
 stdlib/source/test/lux/world/net/http/client.lux   |  2 +-
 stdlib/source/test/lux/world/net/http/status.lux   |  2 +-
 .../test/lux/world/output/video/resolution.lux     |  4 +-
 stdlib/source/test/lux/world/program.lux           |  2 +-
 stdlib/source/test/lux/world/shell.lux             |  2 +-
 241 files changed, 505 insertions(+), 488 deletions(-)

(limited to 'stdlib/source/test')

diff --git a/stdlib/source/test/aedifex/artifact.lux b/stdlib/source/test/aedifex/artifact.lux
index 9a55ccb59..da1941245 100644
--- a/stdlib/source/test/aedifex/artifact.lux
+++ b/stdlib/source/test/aedifex/artifact.lux
@@ -26,7 +26,7 @@
   [\\program
    ["." /]])
 
-(def: #export random
+(def: .public random
   (Random /.Artifact)
   (let [size 4]
     ($_ random.and
@@ -34,7 +34,7 @@
         (random.ascii/lower size)
         (random.ascii/lower size))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do random.monad
diff --git a/stdlib/source/test/aedifex/artifact/extension.lux b/stdlib/source/test/aedifex/artifact/extension.lux
index 132293d4f..93355ea60 100644
--- a/stdlib/source/test/aedifex/artifact/extension.lux
+++ b/stdlib/source/test/aedifex/artifact/extension.lux
@@ -18,7 +18,7 @@
     ["/#" // #_
      ["#" type]]]])
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Extension]
diff --git a/stdlib/source/test/aedifex/artifact/snapshot.lux b/stdlib/source/test/aedifex/artifact/snapshot.lux
index d8ececcd4..f196586ac 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot.lux
@@ -20,12 +20,12 @@
   [\\program
    ["." /]])
 
-(def: #export random
+(def: .public random
   (Random /.Snapshot)
   (random.or (random\in [])
              $/stamp.random))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Snapshot]
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/build.lux b/stdlib/source/test/aedifex/artifact/snapshot/build.lux
index 55bdc0a42..e613c2f92 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/build.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/build.lux
@@ -15,11 +15,11 @@
   [\\program
    ["." /]])
 
-(def: #export random
+(def: .public random
   (Random /.Build)
   random.nat)
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Build]
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux b/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux
index deea0e954..2a2c19e4f 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux
@@ -20,14 +20,14 @@
    ["#." time]
    ["#." build]])
 
-(def: #export random
+(def: .public random
   (Random /.Stamp)
   ($_ random.and
       $//time.random
       $//build.random
       ))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Stamp])
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/time.lux b/stdlib/source/test/aedifex/artifact/snapshot/time.lux
index 05e575e64..a658d3e29 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/time.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/time.lux
@@ -17,11 +17,11 @@
   ["$." /// #_
    ["#." time]])
 
-(def: #export random
+(def: .public random
   (Random /.Time)
   $///time.random)
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Time])
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/version.lux b/stdlib/source/test/aedifex/artifact/snapshot/version.lux
index c63dc4f51..c5ec63398 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/version.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/version.lux
@@ -20,7 +20,7 @@
    ["#." type]
    ["#." time]])
 
-(def: #export random
+(def: .public random
   (Random /.Version)
   ($_ random.and
       $///type.random
@@ -28,7 +28,7 @@
       $///time.random
       ))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Version])
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux b/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux
index cfd8a7f17..ada815059 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux
@@ -28,7 +28,7 @@
      ["#." stamp]
      ["#." time]]]])
 
-(def: #export random
+(def: .public random
   (Random /.Value)
   ($_ random.and
       (random.ascii/alpha 5)
@@ -36,7 +36,7 @@
                  $///stamp.random)
       ))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Value])
diff --git a/stdlib/source/test/aedifex/artifact/time.lux b/stdlib/source/test/aedifex/artifact/time.lux
index 982d2b0f7..ed60f6389 100644
--- a/stdlib/source/test/aedifex/artifact/time.lux
+++ b/stdlib/source/test/aedifex/artifact/time.lux
@@ -22,14 +22,14 @@
    ["#." date]
    ["#." time]])
 
-(def: #export random
+(def: .public random
   (Random /.Time)
   (do random.monad
     [date /date.random
      time /time.random]
     (in [date time])))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Time])
diff --git a/stdlib/source/test/aedifex/artifact/time/date.lux b/stdlib/source/test/aedifex/artifact/time/date.lux
index 5dd7156fc..e58ed00f9 100644
--- a/stdlib/source/test/aedifex/artifact/time/date.lux
+++ b/stdlib/source/test/aedifex/artifact/time/date.lux
@@ -22,7 +22,7 @@
   [\\program
    ["." /]])
 
-(def: #export random
+(def: .public random
   (Random /.Date)
   (random.one (function (_ raw)
                 (try.maybe
@@ -34,7 +34,7 @@
                    (/.date raw))))
               random.date))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Date])
diff --git a/stdlib/source/test/aedifex/artifact/time/time.lux b/stdlib/source/test/aedifex/artifact/time/time.lux
index 904e34aec..9358e7bab 100644
--- a/stdlib/source/test/aedifex/artifact/time/time.lux
+++ b/stdlib/source/test/aedifex/artifact/time/time.lux
@@ -17,12 +17,12 @@
   [\\program
    ["." /]])
 
-(def: #export random
+(def: .public random
   (Random /.Time)
   (random.one (|>> time.clock (set@ #time.milli_second 0) time.time)
               random.time))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Time])
diff --git a/stdlib/source/test/aedifex/artifact/type.lux b/stdlib/source/test/aedifex/artifact/type.lux
index b34db299c..be1fdfc80 100644
--- a/stdlib/source/test/aedifex/artifact/type.lux
+++ b/stdlib/source/test/aedifex/artifact/type.lux
@@ -16,7 +16,7 @@
   [\\program
    ["." /]])
 
-(def: #export random
+(def: .public random
   (Random /.Type)
   ($_ random.either
       ($_ random.either
@@ -28,7 +28,7 @@
           (random\in /.sha-1))
       ))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Type]
diff --git a/stdlib/source/test/aedifex/artifact/versioning.lux b/stdlib/source/test/aedifex/artifact/versioning.lux
index 79d063123..5a0b2df20 100644
--- a/stdlib/source/test/aedifex/artifact/versioning.lux
+++ b/stdlib/source/test/aedifex/artifact/versioning.lux
@@ -19,7 +19,7 @@
    ["#." snapshot
     ["#/." version]]])
 
-(def: #export random
+(def: .public random
   (Random /.Versioning)
   ($_ random.and
       $//snapshot.random
@@ -27,7 +27,7 @@
       (random.list 5 $//snapshot/version.random)
       ))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Versioning])
diff --git a/stdlib/source/test/aedifex/cache.lux b/stdlib/source/test/aedifex/cache.lux
index 07d39f00f..44641af70 100644
--- a/stdlib/source/test/aedifex/cache.lux
+++ b/stdlib/source/test/aedifex/cache.lux
@@ -142,7 +142,7 @@
                                     expected)
                                  actual)))))))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       ($_ _.and
diff --git a/stdlib/source/test/aedifex/cli.lux b/stdlib/source/test/aedifex/cli.lux
index 6c251b0a4..f59cf6619 100644
--- a/stdlib/source/test/aedifex/cli.lux
+++ b/stdlib/source/test/aedifex/cli.lux
@@ -98,7 +98,7 @@
                        (#try.Failure error)
                        false)))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Compilation /.Command]
diff --git a/stdlib/source/test/aedifex/command.lux b/stdlib/source/test/aedifex/command.lux
index fe760258b..8fbca7e56 100644
--- a/stdlib/source/test/aedifex/command.lux
+++ b/stdlib/source/test/aedifex/command.lux
@@ -18,7 +18,7 @@
   [\\program
    ["." /]])
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Command])
diff --git a/stdlib/source/test/aedifex/command/auto.lux b/stdlib/source/test/aedifex/command/auto.lux
index a5b598b11..6a7ef98ab 100644
--- a/stdlib/source/test/aedifex/command/auto.lux
+++ b/stdlib/source/test/aedifex/command/auto.lux
@@ -63,7 +63,7 @@
                    dummy_file)]
              (in [shell.normal []])))))]))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do {! random.monad}
diff --git a/stdlib/source/test/aedifex/command/build.lux b/stdlib/source/test/aedifex/command/build.lux
index be7c8b55e..b5e796c2d 100644
--- a/stdlib/source/test/aedifex/command/build.lux
+++ b/stdlib/source/test/aedifex/command/build.lux
@@ -37,7 +37,7 @@
      ["#." dependency (#+ Dependency)
       ["#/." resolution (#+ Resolution)]]]]])
 
-(def: #export good_shell
+(def: .public good_shell
   (-> Any (Shell IO))
   (shell.mock
    (function (_ [actual_environment actual_working_directory actual_command actual_arguments])
@@ -55,7 +55,7 @@
           (def: (on_await state)
             (#try.Success [state shell.normal]))))))))
 
-(def: #export bad_shell
+(def: .public bad_shell
   (-> Any (Shell IO))
   (shell.mock
    (function (_ [actual_environment actual_working_directory actual_command actual_arguments])
@@ -73,7 +73,7 @@
           (def: (on_await state)
             (#try.Success [state shell.error]))))))))
 
-(def: #export (reader_shell error?)
+(def: .public (reader_shell error?)
   (-> Bit (-> (List Text) (Shell IO)))
   (shell.mock
    (function (_ [actual_environment actual_working_directory actual_command actual_arguments])
@@ -127,7 +127,7 @@
                   [/.ruby_compiler_name]
                   ))))))
 
-(def: #export resolution
+(def: .public resolution
   (Random [Dependency Resolution])
   (do random.monad
     [dependency ..compiler
@@ -136,7 +136,7 @@
          (|> ///dependency/resolution.empty
              (dictionary.put dependency package))])))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do {! random.monad}
diff --git a/stdlib/source/test/aedifex/command/clean.lux b/stdlib/source/test/aedifex/command/clean.lux
index 523cf6ccc..fffef3033 100644
--- a/stdlib/source/test/aedifex/command/clean.lux
+++ b/stdlib/source/test/aedifex/command/clean.lux
@@ -80,7 +80,7 @@
     (in (and directory_exists?
              (list.every? (|>>) files_exist?)))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do {! random.monad}
diff --git a/stdlib/source/test/aedifex/command/deploy.lux b/stdlib/source/test/aedifex/command/deploy.lux
index d315c646c..4bdbafd59 100644
--- a/stdlib/source/test/aedifex/command/deploy.lux
+++ b/stdlib/source/test/aedifex/command/deploy.lux
@@ -59,7 +59,7 @@
      _ (/.do! console repository fs artifact profile)]
     (\ console read_line [])))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do {! random.monad}
diff --git a/stdlib/source/test/aedifex/command/deps.lux b/stdlib/source/test/aedifex/command/deps.lux
index 0d816ec02..0698899da 100644
--- a/stdlib/source/test/aedifex/command/deps.lux
+++ b/stdlib/source/test/aedifex/command/deps.lux
@@ -52,7 +52,7 @@
        ["#/." origin]
        ["#/." local]]]]]])
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do random.monad
diff --git a/stdlib/source/test/aedifex/command/install.lux b/stdlib/source/test/aedifex/command/install.lux
index ed0a3a7d3..0ca484196 100644
--- a/stdlib/source/test/aedifex/command/install.lux
+++ b/stdlib/source/test/aedifex/command/install.lux
@@ -39,7 +39,7 @@
       ["#." repository #_
        ["#/." local]]]]]])
 
-(def: #export (make_sources! fs sources)
+(def: .public (make_sources! fs sources)
   (-> (file.System Async) (Set file.Path) (Action (List Any)))
   (let [/ (\ fs separator)
         ! ///action.monad]
@@ -60,7 +60,7 @@
      _ (/.do! console fs (///repository/local.repository program fs) sample)]
     (\ console read_line [])))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do {! random.monad}
diff --git a/stdlib/source/test/aedifex/command/pom.lux b/stdlib/source/test/aedifex/command/pom.lux
index 54a365468..9577842c1 100644
--- a/stdlib/source/test/aedifex/command/pom.lux
+++ b/stdlib/source/test/aedifex/command/pom.lux
@@ -30,7 +30,7 @@
      ["#." action]
      ["#." pom]]]])
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do random.monad
diff --git a/stdlib/source/test/aedifex/command/test.lux b/stdlib/source/test/aedifex/command/test.lux
index 52c167ee9..f2117fad4 100644
--- a/stdlib/source/test/aedifex/command/test.lux
+++ b/stdlib/source/test/aedifex/command/test.lux
@@ -39,7 +39,7 @@
       ["#." dependency
        ["#/." resolution]]]]]])
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do {! random.monad}
diff --git a/stdlib/source/test/aedifex/command/version.lux b/stdlib/source/test/aedifex/command/version.lux
index aaf320c60..f1c424289 100644
--- a/stdlib/source/test/aedifex/command/version.lux
+++ b/stdlib/source/test/aedifex/command/version.lux
@@ -28,7 +28,7 @@
   [\\program
    ["." /]])
 
-(exception: #export console_is_closed!)
+(exception: .public console_is_closed!)
 
 (implementation: mock
   (Mock [Bit Text])
@@ -57,13 +57,13 @@
       (#try.Success [false buffer])
       (exception.except ..console_is_closed! []))))
 
-(def: #export echo
+(def: .public echo
   (-> Text (Console Async))
   (|>> [true]
        (console.mock ..mock)
        console.async))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do random.monad
diff --git a/stdlib/source/test/aedifex/dependency.lux b/stdlib/source/test/aedifex/dependency.lux
index 733e15710..86d951f99 100644
--- a/stdlib/source/test/aedifex/dependency.lux
+++ b/stdlib/source/test/aedifex/dependency.lux
@@ -15,13 +15,13 @@
   [\\program
    ["." /]])
 
-(def: #export random
+(def: .public random
   (Random /.Dependency)
   ($_ random.and
       @artifact.random
       (random.ascii/alpha 1)))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Dependency]
diff --git a/stdlib/source/test/aedifex/dependency/deployment.lux b/stdlib/source/test/aedifex/dependency/deployment.lux
index 8c1e2e61a..ec2ecad3d 100644
--- a/stdlib/source/test/aedifex/dependency/deployment.lux
+++ b/stdlib/source/test/aedifex/dependency/deployment.lux
@@ -143,7 +143,7 @@
                           artifact/type.lux_library])]]
     (in [dependency artifact package])))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do {! random.monad}
diff --git a/stdlib/source/test/aedifex/dependency/resolution.lux b/stdlib/source/test/aedifex/dependency/resolution.lux
index 89e16691d..01b57eb62 100644
--- a/stdlib/source/test/aedifex/dependency/resolution.lux
+++ b/stdlib/source/test/aedifex/dependency/resolution.lux
@@ -86,7 +86,7 @@
        (\ ///hash.md5_codec encode)
        (\ utf8.codec encode)))
 
-(def: #export nope
+(def: .public nope
   (Mock Any)
   (implementation
    (def: the_description
@@ -96,7 +96,7 @@
    (def: (on_upload uri binary state)
      (#try.Failure "NOPE"))))
 
-(def: #export (single artifact package)
+(def: .public (single artifact package)
   (-> Artifact Package (Mock Any))
   (let [expected (///artifact.uri (get@ #///artifact.version artifact) artifact)]
     (implementation
@@ -427,7 +427,7 @@
                              (not (dictionary.key? resolution ignored))))))
         )))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Resolution])
diff --git a/stdlib/source/test/aedifex/dependency/status.lux b/stdlib/source/test/aedifex/dependency/status.lux
index 5b446d643..aad21027d 100644
--- a/stdlib/source/test/aedifex/dependency/status.lux
+++ b/stdlib/source/test/aedifex/dependency/status.lux
@@ -18,7 +18,7 @@
     ["//#" /// #_
      ["#." hash]]]])
 
-(def: #export random
+(def: .public random
   (Random /.Status)
   ($_ random.or
       (random\in [])
@@ -28,7 +28,7 @@
                   ($///hash.random ///hash.md5))
       ))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Status]
diff --git a/stdlib/source/test/aedifex/hash.lux b/stdlib/source/test/aedifex/hash.lux
index 524110c35..dc5633040 100644
--- a/stdlib/source/test/aedifex/hash.lux
+++ b/stdlib/source/test/aedifex/hash.lux
@@ -25,7 +25,7 @@
     [data
      ["_." binary]]]])
 
-(def: #export (random hash)
+(def: .public (random hash)
   (All [h]
     (-> (-> Binary (/.Hash h))
         (Random (/.Hash h))))
@@ -33,7 +33,7 @@
     [size (\ ! map (n.% 100) random.nat)]
     (\ ! map hash (_binary.random size))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Hash /.SHA-1 /.MD5])
diff --git a/stdlib/source/test/aedifex/input.lux b/stdlib/source/test/aedifex/input.lux
index 4b2ee9ea2..168d378d4 100644
--- a/stdlib/source/test/aedifex/input.lux
+++ b/stdlib/source/test/aedifex/input.lux
@@ -41,7 +41,7 @@
   (-> (Set Address) (Set Address))
   (set.add //.default_repository))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do {! random.monad}
diff --git a/stdlib/source/test/aedifex/local.lux b/stdlib/source/test/aedifex/local.lux
index bd78c3464..a797f2a97 100644
--- a/stdlib/source/test/aedifex/local.lux
+++ b/stdlib/source/test/aedifex/local.lux
@@ -15,7 +15,7 @@
     ["/#" // #_
      ["#." artifact]]]])
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do {! random.monad}
diff --git a/stdlib/source/test/aedifex/metadata.lux b/stdlib/source/test/aedifex/metadata.lux
index d4e6e816c..a19f6dfa7 100644
--- a/stdlib/source/test/aedifex/metadata.lux
+++ b/stdlib/source/test/aedifex/metadata.lux
@@ -16,7 +16,7 @@
   [\\program
    ["." /]])
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       ($_ _.and
diff --git a/stdlib/source/test/aedifex/metadata/artifact.lux b/stdlib/source/test/aedifex/metadata/artifact.lux
index 95897c212..2e6a8e10f 100644
--- a/stdlib/source/test/aedifex/metadata/artifact.lux
+++ b/stdlib/source/test/aedifex/metadata/artifact.lux
@@ -41,7 +41,7 @@
       ["#." repository #_
        ["#/." local]]]]]])
 
-(def: #export random
+(def: .public random
   (Random /.Metadata)
   ($_ random.and
       (random.ascii/alpha 5)
@@ -66,7 +66,7 @@
                        #time.milli_second 0})]
                (in (instant.of_date_time date time))))))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Metadata])
diff --git a/stdlib/source/test/aedifex/metadata/snapshot.lux b/stdlib/source/test/aedifex/metadata/snapshot.lux
index 4dd751639..7b375d42c 100644
--- a/stdlib/source/test/aedifex/metadata/snapshot.lux
+++ b/stdlib/source/test/aedifex/metadata/snapshot.lux
@@ -78,14 +78,14 @@
       (random.list 5 $///artifact/snapshot/version.random)
       ))
 
-(def: #export random
+(def: .public random
   (Random /.Metadata)
   ($_ random.and
       $///artifact.random
       ..random_versioning
       ))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Metadata])
diff --git a/stdlib/source/test/aedifex/package.lux b/stdlib/source/test/aedifex/package.lux
index 9c6adfcf2..e05dc712f 100644
--- a/stdlib/source/test/aedifex/package.lux
+++ b/stdlib/source/test/aedifex/package.lux
@@ -40,7 +40,7 @@
      [repository
       ["#." origin]]]]])
 
-(def: #export random
+(def: .public random
   (Random [//.Profile /.Package])
   (do {! random.monad}
     [content_size (\ ! map (n.% 100) random.nat)
@@ -53,7 +53,7 @@
                                $profile.random)]
     (in [profile (/.local pom content)])))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Package])
diff --git a/stdlib/source/test/aedifex/parser.lux b/stdlib/source/test/aedifex/parser.lux
index 360c30a4a..4c882ea4a 100644
--- a/stdlib/source/test/aedifex/parser.lux
+++ b/stdlib/source/test/aedifex/parser.lux
@@ -114,7 +114,7 @@
                        (#try.Failure error)
                        false)))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.covering //format._)
diff --git a/stdlib/source/test/aedifex/pom.lux b/stdlib/source/test/aedifex/pom.lux
index 01b90c33e..657c6192d 100644
--- a/stdlib/source/test/aedifex/pom.lux
+++ b/stdlib/source/test/aedifex/pom.lux
@@ -22,7 +22,7 @@
     ["/#" // #_
      ["#" profile]]]])
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       ($_ _.and
diff --git a/stdlib/source/test/aedifex/profile.lux b/stdlib/source/test/aedifex/profile.lux
index 755c0e13a..857aaf6e1 100644
--- a/stdlib/source/test/aedifex/profile.lux
+++ b/stdlib/source/test/aedifex/profile.lux
@@ -117,7 +117,7 @@
   (Random /.Target)
   (random.ascii/alpha 1))
 
-(def: #export random
+(def: .public random
   (Random /.Profile)
   ($_ random.and
       (..list_of ..name)
@@ -138,7 +138,7 @@
       (random\in //runtime.default_ruby)
       ))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Distribution /.License /.SCM /.Organization
diff --git a/stdlib/source/test/aedifex/project.lux b/stdlib/source/test/aedifex/project.lux
index 809bea253..3d027eec7 100644
--- a/stdlib/source/test/aedifex/project.lux
+++ b/stdlib/source/test/aedifex/project.lux
@@ -30,13 +30,13 @@
       (random\map (set@ #//.parents (list)))
       (random.and (random.ascii/alpha 1))))
 
-(def: #export random
+(def: .public random
   (Random /.Project)
   (do random.monad
     [[name profile] ..profile]
     (in (/.project name profile))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Project /.project]
diff --git a/stdlib/source/test/aedifex/repository.lux b/stdlib/source/test/aedifex/repository.lux
index 88efb42fe..eead05e89 100644
--- a/stdlib/source/test/aedifex/repository.lux
+++ b/stdlib/source/test/aedifex/repository.lux
@@ -53,7 +53,7 @@
 (type: Store
   (Dictionary URI Binary))
 
-(def: #export empty
+(def: .public empty
   Store
   (dictionary.empty text.hash))
 
@@ -65,7 +65,7 @@
   Version
   "4.5.6-NO")
 
-(implementation: #export mock
+(implementation: .public mock
   (/.Mock Store)
 
   (def: the_description
@@ -84,7 +84,7 @@
       (exception.except ..cannot_upload [uri])
       (exception.return (dictionary.put uri content state)))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       ($_ _.and
diff --git a/stdlib/source/test/aedifex/repository/identity.lux b/stdlib/source/test/aedifex/repository/identity.lux
index e19acde36..6158d2397 100644
--- a/stdlib/source/test/aedifex/repository/identity.lux
+++ b/stdlib/source/test/aedifex/repository/identity.lux
@@ -10,14 +10,14 @@
   [\\program
    ["." /]])
 
-(def: #export random
+(def: .public random
   (Random /.Identity)
   ($_ random.and
       (random.ascii/alpha 10)
       (random.ascii/alpha 10)
       ))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.User /.Password /.Identity]
diff --git a/stdlib/source/test/aedifex/repository/local.lux b/stdlib/source/test/aedifex/repository/local.lux
index a63f4c256..b2352bdd2 100644
--- a/stdlib/source/test/aedifex/repository/local.lux
+++ b/stdlib/source/test/aedifex/repository/local.lux
@@ -23,7 +23,7 @@
   [\\program
    ["." /]])
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do {! random.monad}
diff --git a/stdlib/source/test/aedifex/repository/origin.lux b/stdlib/source/test/aedifex/repository/origin.lux
index daf8e8667..80c2946bc 100644
--- a/stdlib/source/test/aedifex/repository/origin.lux
+++ b/stdlib/source/test/aedifex/repository/origin.lux
@@ -10,14 +10,14 @@
   [\\program
    ["." /]])
 
-(def: #export random
+(def: .public random
   (Random /.Origin)
   ($_ random.or
       (random.ascii/alpha 10)
       (random.ascii/alpha 10)
       ))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Origin]
diff --git a/stdlib/source/test/aedifex/repository/remote.lux b/stdlib/source/test/aedifex/repository/remote.lux
index cad0fe873..0ff764bdd 100644
--- a/stdlib/source/test/aedifex/repository/remote.lux
+++ b/stdlib/source/test/aedifex/repository/remote.lux
@@ -80,7 +80,7 @@
           {#@http.headers (http.headers (list))
            #@http.body (..url_body "")}]))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do {! random.monad}
diff --git a/stdlib/source/test/aedifex/runtime.lux b/stdlib/source/test/aedifex/runtime.lux
index bd87377bc..7508239ad 100644
--- a/stdlib/source/test/aedifex/runtime.lux
+++ b/stdlib/source/test/aedifex/runtime.lux
@@ -19,7 +19,7 @@
   [\\program
    ["." /]])
 
-(def: #export random
+(def: .public random
   (Random /.Runtime)
   ($_ random.either
       (random\in /.default_java)
@@ -29,7 +29,7 @@
       (random\in /.default_ruby)
       ))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Runtime])
diff --git a/stdlib/source/test/lux.lux b/stdlib/source/test/lux.lux
index 9d5f719ed..925894d7b 100644
--- a/stdlib/source/test/lux.lux
+++ b/stdlib/source/test/lux.lux
@@ -59,10 +59,10 @@
 
 ## TODO: Get rid of this ASAP
 (template: (!bundle body)
-  (: Test
-     (do random.monad
-       [_ (in [])]
-       body)))
+  [(: Test
+      (do random.monad
+        [_ (in [])]
+        body))])
 
 (def: sub_tests
   Test
@@ -580,7 +580,7 @@
                          (actual [expected_left expected_right])))))))
 
 (/.template: (!n/+ <left> <right>)
-  (n.+ <left> <right>))
+  [(n.+ <left> <right>)])
 
 (def: for_template
   Test
@@ -1091,6 +1091,16 @@
                (for_meta|Module_State))
       ))
 
+(def: for_export
+  Test
+  ($_ _.and
+      (_.cover [/.public /.private]
+               (and /.public (not /.private)))
+      (_.cover [/.global /.local]
+               (and (bit\= /.public /.global)
+                    (bit\= /.private /.local)))
+      ))
+
 (def: test
   Test
   (<| (_.covering /._)
@@ -1117,6 +1127,7 @@
           ..for_def:
           ..for_import
           ..for_meta
+          ..for_export
           
           ..sub_tests
           )))
diff --git a/stdlib/source/test/lux/abstract.lux b/stdlib/source/test/lux/abstract.lux
index e8368434b..cb41844eb 100644
--- a/stdlib/source/test/lux/abstract.lux
+++ b/stdlib/source/test/lux/abstract.lux
@@ -41,7 +41,7 @@
       /comonad/cofree.test
       ))
 
-(def: #export test
+(def: .public test
   Test
   ($_ _.and
       /apply.test
diff --git a/stdlib/source/test/lux/abstract/apply.lux b/stdlib/source/test/lux/abstract/apply.lux
index 01fe8375f..7a940adb3 100644
--- a/stdlib/source/test/lux/abstract/apply.lux
+++ b/stdlib/source/test/lux/abstract/apply.lux
@@ -15,7 +15,7 @@
   [\\library
    ["." / (#+ Apply)]])
 
-(def: #export test
+(def: .public test
   Test
   (do random.monad
     [left random.nat
diff --git a/stdlib/source/test/lux/abstract/codec.lux b/stdlib/source/test/lux/abstract/codec.lux
index 00452c205..debc5c17c 100644
--- a/stdlib/source/test/lux/abstract/codec.lux
+++ b/stdlib/source/test/lux/abstract/codec.lux
@@ -33,7 +33,7 @@
   (Codec Text Bit)
   (/.compose json.codec ..json))
 
-(def: #export test
+(def: .public test
   Test
   (do random.monad
     [expected random.bit]
diff --git a/stdlib/source/test/lux/abstract/comonad.lux b/stdlib/source/test/lux/abstract/comonad.lux
index eb50c0f53..431272d9f 100644
--- a/stdlib/source/test/lux/abstract/comonad.lux
+++ b/stdlib/source/test/lux/abstract/comonad.lux
@@ -13,7 +13,7 @@
   [\\library
    ["." /]])
 
-(def: #export test
+(def: .public test
   Test
   (do random.monad
     [sample random.nat]
diff --git a/stdlib/source/test/lux/abstract/comonad/cofree.lux b/stdlib/source/test/lux/abstract/comonad/cofree.lux
index ecb90c77c..531510a04 100644
--- a/stdlib/source/test/lux/abstract/comonad/cofree.lux
+++ b/stdlib/source/test/lux/abstract/comonad/cofree.lux
@@ -37,7 +37,7 @@
        (sequence.take 100 (..interpret left))
        (sequence.take 100 (..interpret right)))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.CoFree])
diff --git a/stdlib/source/test/lux/abstract/enum.lux b/stdlib/source/test/lux/abstract/enum.lux
index 7eb4149a1..8de8d659f 100644
--- a/stdlib/source/test/lux/abstract/enum.lux
+++ b/stdlib/source/test/lux/abstract/enum.lux
@@ -16,7 +16,7 @@
   [\\library
    ["." /]])
 
-(def: #export test
+(def: .public test
   Test
   (let [limit (: (Random Nat)
                  (\ random.monad map (n.% 20) random.nat))]
diff --git a/stdlib/source/test/lux/abstract/equivalence.lux b/stdlib/source/test/lux/abstract/equivalence.lux
index bdf24150d..89fa542a1 100644
--- a/stdlib/source/test/lux/abstract/equivalence.lux
+++ b/stdlib/source/test/lux/abstract/equivalence.lux
@@ -17,7 +17,7 @@
   [\\library
    ["." / (#+ Equivalence)]])
 
-(def: #export test
+(def: .public test
   Test
   (do random.monad
     [leftN random.nat
diff --git a/stdlib/source/test/lux/abstract/fold.lux b/stdlib/source/test/lux/abstract/fold.lux
index a07a19870..1dbf9eec8 100644
--- a/stdlib/source/test/lux/abstract/fold.lux
+++ b/stdlib/source/test/lux/abstract/fold.lux
@@ -14,7 +14,7 @@
   [\\library
    ["." / (#+ Fold)]])
 
-(def: #export test
+(def: .public test
   Test
   (do random.monad
     [samples (random.list 10 random.nat)]
diff --git a/stdlib/source/test/lux/abstract/functor.lux b/stdlib/source/test/lux/abstract/functor.lux
index 63b0ad2d7..178f33273 100644
--- a/stdlib/source/test/lux/abstract/functor.lux
+++ b/stdlib/source/test/lux/abstract/functor.lux
@@ -15,7 +15,7 @@
   [\\library
    ["." / (#+ Functor)]])
 
-(def: #export test
+(def: .public test
   Test
   (do random.monad
     [left random.nat
diff --git a/stdlib/source/test/lux/abstract/functor/contravariant.lux b/stdlib/source/test/lux/abstract/functor/contravariant.lux
index 6a07cb0c5..26d7032a2 100644
--- a/stdlib/source/test/lux/abstract/functor/contravariant.lux
+++ b/stdlib/source/test/lux/abstract/functor/contravariant.lux
@@ -5,7 +5,7 @@
   [\\library
    ["." /]])
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.in_parallel (list))))
diff --git a/stdlib/source/test/lux/abstract/hash.lux b/stdlib/source/test/lux/abstract/hash.lux
index eecb43227..4d5fa9eaf 100644
--- a/stdlib/source/test/lux/abstract/hash.lux
+++ b/stdlib/source/test/lux/abstract/hash.lux
@@ -18,7 +18,7 @@
     [//
      [equivalence (#+ Equivalence)]]]])
 
-(def: #export test
+(def: .public test
   Test
   (do random.monad
     [leftN random.nat
diff --git a/stdlib/source/test/lux/abstract/interval.lux b/stdlib/source/test/lux/abstract/interval.lux
index 40c78df27..2b588f309 100644
--- a/stdlib/source/test/lux/abstract/interval.lux
+++ b/stdlib/source/test/lux/abstract/interval.lux
@@ -21,7 +21,7 @@
    ["." / (#+ Interval) ("\." equivalence)]])
 
 (template [<name> <cmp>]
-  [(def: #export <name>
+  [(def: .public <name>
      (Random (Interval Nat))
      (do random.monad
        [bottom random.nat
@@ -35,13 +35,13 @@
   [outer n.>]
   )
 
-(def: #export singleton
+(def: .public singleton
   (Random (Interval Nat))
   (do random.monad
     [point random.nat]
     (in (/.singleton n.enum point))))
 
-(def: #export interval
+(def: .public interval
   (Random (Interval Nat))
   ($_ random.either
       ..inner
@@ -244,7 +244,7 @@
                        (/.overlaps? outer right_inner))))
         )))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       ($_ _.and
diff --git a/stdlib/source/test/lux/abstract/monad.lux b/stdlib/source/test/lux/abstract/monad.lux
index 02264e013..0fc605a0c 100644
--- a/stdlib/source/test/lux/abstract/monad.lux
+++ b/stdlib/source/test/lux/abstract/monad.lux
@@ -13,7 +13,7 @@
   [\\library
    ["." / (#+ Monad do)]])
 
-(def: #export test
+(def: .public test
   Test
   (do random.monad
     [mono random.nat
diff --git a/stdlib/source/test/lux/abstract/monad/free.lux b/stdlib/source/test/lux/abstract/monad/free.lux
index 2a5a562f2..ee696a14b 100644
--- a/stdlib/source/test/lux/abstract/monad/free.lux
+++ b/stdlib/source/test/lux/abstract/monad/free.lux
@@ -40,7 +40,7 @@
        (..interpret left)
        (..interpret right))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Free])
diff --git a/stdlib/source/test/lux/abstract/monoid.lux b/stdlib/source/test/lux/abstract/monoid.lux
index 876ac1f46..98c33068a 100644
--- a/stdlib/source/test/lux/abstract/monoid.lux
+++ b/stdlib/source/test/lux/abstract/monoid.lux
@@ -14,7 +14,7 @@
     [//
      [equivalence (#+ Equivalence)]]]])
 
-(def: #export test
+(def: .public test
   Test
   (do random.monad
     [natL random.nat
diff --git a/stdlib/source/test/lux/abstract/order.lux b/stdlib/source/test/lux/abstract/order.lux
index 1f84914f3..564b731e8 100644
--- a/stdlib/source/test/lux/abstract/order.lux
+++ b/stdlib/source/test/lux/abstract/order.lux
@@ -18,7 +18,7 @@
     [//
      [equivalence (#+ Equivalence)]]]])
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do random.monad
diff --git a/stdlib/source/test/lux/abstract/predicate.lux b/stdlib/source/test/lux/abstract/predicate.lux
index f0c7ffbbd..b3521ca3c 100644
--- a/stdlib/source/test/lux/abstract/predicate.lux
+++ b/stdlib/source/test/lux/abstract/predicate.lux
@@ -28,7 +28,7 @@
     0 (function.constant false)
     _ (|>> (n.% factor) (n.= 0))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do {! random.monad}
diff --git a/stdlib/source/test/lux/control.lux b/stdlib/source/test/lux/control.lux
index a4bb2c5f2..4ac09ca39 100644
--- a/stdlib/source/test/lux/control.lux
+++ b/stdlib/source/test/lux/control.lux
@@ -48,7 +48,7 @@
       /capability.test
       ))
 
-(def: #export test
+(def: .public test
   Test
   ($_ _.and
       /concatenative.test
diff --git a/stdlib/source/test/lux/control/concatenative.lux b/stdlib/source/test/lux/control/concatenative.lux
index 4f2774e2b..deb5601a7 100644
--- a/stdlib/source/test/lux/control/concatenative.lux
+++ b/stdlib/source/test/lux/control/concatenative.lux
@@ -93,30 +93,30 @@
             ))))
 
 (template: (!numerical <=> <generator> <only> <arithmetic> <order>)
-  (: Test
-     (with_expansions [<arithmetic>' (template.spliced <arithmetic>)
-                       <order>' (template.spliced <order>)]
-       (do random.monad
-         [parameter (|> <generator> (random.only <only>))
-          subject <generator>]
-         (`` ($_ _.and
-                 (~~ (template [<concatenative> <functional>]
-                       [(_.cover [<concatenative>]
-                                 (<=> (<functional> parameter subject)
-                                      (||> (/.push subject)
-                                           (/.push parameter)
-                                           <concatenative>)))]
+  [(: Test
+      (with_expansions [<arithmetic>' (template.spliced <arithmetic>)
+                        <order>' (template.spliced <order>)]
+        (do random.monad
+          [parameter (|> <generator> (random.only <only>))
+           subject <generator>]
+          (`` ($_ _.and
+                  (~~ (template [<concatenative> <functional>]
+                        [(_.cover [<concatenative>]
+                                  (<=> (<functional> parameter subject)
+                                       (||> (/.push subject)
+                                            (/.push parameter)
+                                            <concatenative>)))]
 
-                       <arithmetic>'))
-                 (~~ (template [<concatenative> <functional>]
-                       [(_.cover [<concatenative>]
-                                 (bit\= (<functional> parameter subject)
-                                        (||> (/.push subject)
-                                             (/.push parameter)
-                                             <concatenative>)))]
+                        <arithmetic>'))
+                  (~~ (template [<concatenative> <functional>]
+                        [(_.cover [<concatenative>]
+                                  (bit\= (<functional> parameter subject)
+                                         (||> (/.push subject)
+                                              (/.push parameter)
+                                              <concatenative>)))]
 
-                       <order>'))
-                 ))))))
+                        <order>'))
+                  )))))])
 
 (def: numerical
   Test
@@ -306,7 +306,7 @@
                   (||> (/.push sample)
                        ..square)))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       ($_ _.and
diff --git a/stdlib/source/test/lux/control/concurrency/actor.lux b/stdlib/source/test/lux/control/concurrency/actor.lux
index 95566db38..618271a6e 100644
--- a/stdlib/source/test/lux/control/concurrency/actor.lux
+++ b/stdlib/source/test/lux/control/concurrency/actor.lux
@@ -28,6 +28,8 @@
 (exception: got_wrecked)
 
 (actor: counter
+  {}
+
   Nat
 
   ((on_mail message state self)
@@ -45,7 +47,7 @@
     (#try.Success _) true
     (#try.Failure _) false))
 
-(def: #export test
+(def: .public test
   Test
   (do {! random.monad}
     [initial_state random.nat
diff --git a/stdlib/source/test/lux/control/concurrency/async.lux b/stdlib/source/test/lux/control/concurrency/async.lux
index 063d3a9e0..b16aa0bf2 100644
--- a/stdlib/source/test/lux/control/concurrency/async.lux
+++ b/stdlib/source/test/lux/control/concurrency/async.lux
@@ -50,7 +50,7 @@
         (i64.left_shifted 4 1)}
        (i64.left_shifted 3 1)))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do {! random.monad}
diff --git a/stdlib/source/test/lux/control/concurrency/atom.lux b/stdlib/source/test/lux/control/concurrency/atom.lux
index 49947d2d6..aec2d56d9 100644
--- a/stdlib/source/test/lux/control/concurrency/atom.lux
+++ b/stdlib/source/test/lux/control/concurrency/atom.lux
@@ -13,7 +13,7 @@
   [\\library
    ["." /]])
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       ($_ _.and
diff --git a/stdlib/source/test/lux/control/concurrency/frp.lux b/stdlib/source/test/lux/control/concurrency/frp.lux
index f4705f140..ecb6d7c93 100644
--- a/stdlib/source/test/lux/control/concurrency/frp.lux
+++ b/stdlib/source/test/lux/control/concurrency/frp.lux
@@ -62,7 +62,7 @@
           (\ ! map (|>> (#.Item head))
              (take_amount (dec amount_of_polls) [channel sink]))))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (let [(^open "list\.") (list.equivalence n.equivalence)]
diff --git a/stdlib/source/test/lux/control/concurrency/semaphore.lux b/stdlib/source/test/lux/control/concurrency/semaphore.lux
index 60bd31050..33c5e1da1 100644
--- a/stdlib/source/test/lux/control/concurrency/semaphore.lux
+++ b/stdlib/source/test/lux/control/concurrency/semaphore.lux
@@ -177,7 +177,7 @@
                                                  expected_ids))))))
              )))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       ($_ _.and
diff --git a/stdlib/source/test/lux/control/concurrency/stm.lux b/stdlib/source/test/lux/control/concurrency/stm.lux
index 62d912f66..79880064e 100644
--- a/stdlib/source/test/lux/control/concurrency/stm.lux
+++ b/stdlib/source/test/lux/control/concurrency/stm.lux
@@ -35,7 +35,7 @@
     (== (product.right (left (list)))
         (product.right (right (list))))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do {! random.monad}
diff --git a/stdlib/source/test/lux/control/concurrency/thread.lux b/stdlib/source/test/lux/control/concurrency/thread.lux
index 28d751292..182a05908 100644
--- a/stdlib/source/test/lux/control/concurrency/thread.lux
+++ b/stdlib/source/test/lux/control/concurrency/thread.lux
@@ -20,7 +20,7 @@
      ["." atom (#+ Atom)]
      ["." async]]]])
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do {! random.monad}
diff --git a/stdlib/source/test/lux/control/continuation.lux b/stdlib/source/test/lux/control/continuation.lux
index 1e960d947..6635d84b6 100644
--- a/stdlib/source/test/lux/control/continuation.lux
+++ b/stdlib/source/test/lux/control/continuation.lux
@@ -27,7 +27,7 @@
   (function (_ == left right)
     (== (/.run left) (/.run right))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do random.monad
diff --git a/stdlib/source/test/lux/control/exception.lux b/stdlib/source/test/lux/control/exception.lux
index b0a957c21..13bde092b 100644
--- a/stdlib/source/test/lux/control/exception.lux
+++ b/stdlib/source/test/lux/control/exception.lux
@@ -23,7 +23,7 @@
 (exception: (custom_exception {value Nat})
   (/.report [label (%.nat value)]))
 
-(def: #export test
+(def: .public test
   Test
   (do {! random.monad}
     [expected random.nat
diff --git a/stdlib/source/test/lux/control/function.lux b/stdlib/source/test/lux/control/function.lux
index def4945cb..b65995923 100644
--- a/stdlib/source/test/lux/control/function.lux
+++ b/stdlib/source/test/lux/control/function.lux
@@ -21,7 +21,7 @@
    ["#." mixin]
    ["#." mutual]])
 
-(def: #export test
+(def: .public test
   Test
   (do {! random.monad}
     [expected random.nat
diff --git a/stdlib/source/test/lux/control/function/contract.lux b/stdlib/source/test/lux/control/function/contract.lux
index 81840fd08..436ba2282 100644
--- a/stdlib/source/test/lux/control/function/contract.lux
+++ b/stdlib/source/test/lux/control/function/contract.lux
@@ -13,7 +13,7 @@
   [\\library
    ["." /]])
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do {! random.monad}
diff --git a/stdlib/source/test/lux/control/function/memo.lux b/stdlib/source/test/lux/control/function/memo.lux
index d6765a1f1..11e1b876c 100644
--- a/stdlib/source/test/lux/control/function/memo.lux
+++ b/stdlib/source/test/lux/control/function/memo.lux
@@ -54,7 +54,7 @@
   Nat
   (i64.left_shifted 4 1))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do {! random.monad}
diff --git a/stdlib/source/test/lux/control/function/mixin.lux b/stdlib/source/test/lux/control/function/mixin.lux
index 3d8299929..5cd283eaa 100644
--- a/stdlib/source/test/lux/control/function/mixin.lux
+++ b/stdlib/source/test/lux/control/function/mixin.lux
@@ -21,7 +21,7 @@
   [\\library
    ["." /]])
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do {! random.monad}
diff --git a/stdlib/source/test/lux/control/function/mutual.lux b/stdlib/source/test/lux/control/function/mutual.lux
index 71248a1ee..5aeb9be71 100644
--- a/stdlib/source/test/lux/control/function/mutual.lux
+++ b/stdlib/source/test/lux/control/function/mutual.lux
@@ -57,7 +57,7 @@
         (and (bit\= expected (..even? sample))
              (bit\= (not expected) (..odd? sample))))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       ($_ _.and
diff --git a/stdlib/source/test/lux/control/io.lux b/stdlib/source/test/lux/control/io.lux
index 05642a19f..43d891a61 100644
--- a/stdlib/source/test/lux/control/io.lux
+++ b/stdlib/source/test/lux/control/io.lux
@@ -26,7 +26,7 @@
   (function (_ == left right)
     (== (/.run left) (/.run right))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.IO])
diff --git a/stdlib/source/test/lux/control/parser.lux b/stdlib/source/test/lux/control/parser.lux
index c222cee77..7b183db51 100644
--- a/stdlib/source/test/lux/control/parser.lux
+++ b/stdlib/source/test/lux/control/parser.lux
@@ -343,7 +343,7 @@
       _
       false)))
 
-(def: #export test
+(def: .public test
   Test
   (do random.monad
     [expected random.nat
diff --git a/stdlib/source/test/lux/control/parser/analysis.lux b/stdlib/source/test/lux/control/parser/analysis.lux
index b16045572..8b7f6405f 100644
--- a/stdlib/source/test/lux/control/parser/analysis.lux
+++ b/stdlib/source/test/lux/control/parser/analysis.lux
@@ -33,19 +33,19 @@
    ["." /]])
 
 (template: (!expect <expectation> <computation>)
-  (case <computation>
-    <expectation>
-    true
+  [(case <computation>
+     <expectation>
+     true
 
-    _
-    false))
+     _
+     false)])
 
 (def: constant
   (Random Constant)
   (random.and (random.unicode 10)
               (random.unicode 10)))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Parser])
diff --git a/stdlib/source/test/lux/control/parser/binary.lux b/stdlib/source/test/lux/control/parser/binary.lux
index c494562bc..bbba888a7 100644
--- a/stdlib/source/test/lux/control/parser/binary.lux
+++ b/stdlib/source/test/lux/control/parser/binary.lux
@@ -42,12 +42,12 @@
    ["." /]])
 
 (template: (!expect <expectation> <computation>)
-  (case <computation>
-    <expectation>
-    true
+  [(case <computation>
+     <expectation>
+     true
 
-    _
-    false))
+     _
+     false)])
 
 (def: segment_size 10)
 
@@ -318,7 +318,7 @@
                                              actual))))))
           )))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Parser])
diff --git a/stdlib/source/test/lux/control/parser/cli.lux b/stdlib/source/test/lux/control/parser/cli.lux
index 4f8d6d08f..33476e15a 100644
--- a/stdlib/source/test/lux/control/parser/cli.lux
+++ b/stdlib/source/test/lux/control/parser/cli.lux
@@ -19,14 +19,14 @@
    ["." /]])
 
 (template: (!expect <pattern> <value>)
-  (case <value>
-    <pattern>
-    true
-    
-    _
-    false))
+  [(case <value>
+     <pattern>
+     true
+     
+     _
+     false)])
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Parser])
diff --git a/stdlib/source/test/lux/control/parser/code.lux b/stdlib/source/test/lux/control/parser/code.lux
index a9adeb507..d2168122a 100644
--- a/stdlib/source/test/lux/control/parser/code.lux
+++ b/stdlib/source/test/lux/control/parser/code.lux
@@ -27,19 +27,19 @@
    ["." /]])
 
 (template: (!expect <pattern> <value>)
-  (case <value>
-    <pattern>
-    true
-    
-    _
-    false))
+  [(case <value>
+     <pattern>
+     true
+     
+     _
+     false)])
 
 (def: random_name
   (Random Name)
   (random.and (random.unicode 1)
               (random.unicode 1)))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Parser])
diff --git a/stdlib/source/test/lux/control/parser/environment.lux b/stdlib/source/test/lux/control/parser/environment.lux
index 756fa38be..215213e59 100644
--- a/stdlib/source/test/lux/control/parser/environment.lux
+++ b/stdlib/source/test/lux/control/parser/environment.lux
@@ -19,7 +19,7 @@
    ["." /
     ["/#" // ("#\." monad)]]])
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Environment /.Parser])
diff --git a/stdlib/source/test/lux/control/parser/json.lux b/stdlib/source/test/lux/control/parser/json.lux
index e3a7189df..3a77b3c3e 100644
--- a/stdlib/source/test/lux/control/parser/json.lux
+++ b/stdlib/source/test/lux/control/parser/json.lux
@@ -29,18 +29,18 @@
    ["." /]])
 
 (template: (!expect <pattern> <value>)
-  (case <value>
-    <pattern>
-    true
-    
-    _
-    false))
+  [(case <value>
+     <pattern>
+     true
+     
+     _
+     false)])
 
 (def: safe_frac
   (Random Frac)
   (random.only (|>> frac.not_a_number? not) random.frac))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Parser])
diff --git a/stdlib/source/test/lux/control/parser/synthesis.lux b/stdlib/source/test/lux/control/parser/synthesis.lux
index cd617ff8d..753091e27 100644
--- a/stdlib/source/test/lux/control/parser/synthesis.lux
+++ b/stdlib/source/test/lux/control/parser/synthesis.lux
@@ -33,12 +33,12 @@
    ["." /]])
 
 (template: (!expect <pattern> <value>)
-  (case <value>
-    <pattern>
-    true
-    
-    _
-    false))
+  [(case <value>
+     <pattern>
+     true
+     
+     _
+     false)])
 
 (def: random_constant
   (Random Name)
@@ -158,7 +158,7 @@
                                            (exception.match? /.cannot_parse error)))))))
       ))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Parser])
diff --git a/stdlib/source/test/lux/control/parser/text.lux b/stdlib/source/test/lux/control/parser/text.lux
index 97c76f0f5..878b82fa9 100644
--- a/stdlib/source/test/lux/control/parser/text.lux
+++ b/stdlib/source/test/lux/control/parser/text.lux
@@ -32,12 +32,12 @@
      ["<c>" code]]]])
 
 (template: (!expect <pattern> <value>)
-  (case <value>
-    <pattern>
-    true
-    
-    _
-    false))
+  [(case <value>
+     <pattern>
+     true
+     
+     _
+     false)])
 
 (def: (should_fail' sample parser exception)
   (All [a e] (-> Text (/.Parser a) (Exception e) Bit))
@@ -291,7 +291,7 @@
                         (..should_fail (format first) (/.between! 2 1 octal!)))))
         )))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Parser])
diff --git a/stdlib/source/test/lux/control/parser/tree.lux b/stdlib/source/test/lux/control/parser/tree.lux
index 25f6c350c..0d1cc090e 100644
--- a/stdlib/source/test/lux/control/parser/tree.lux
+++ b/stdlib/source/test/lux/control/parser/tree.lux
@@ -20,36 +20,36 @@
     ["/#" //]]])
 
 (template: (!expect <pattern> <value>)
-  (case <value>
-    <pattern>
-    true
-    
-    _
-    false))
+  [(case <value>
+     <pattern>
+     true
+     
+     _
+     false)])
 
 (template: (!cover <coverage> <parser> <sample>)
-  (do {! random.monad}
-    [dummy random.nat
-     expected (|> random.nat (random.only (|>> (n.= dummy) not)))]
-    (_.cover <coverage>
-             (|> (/.run <parser>
-                        <sample>)
-                 (!expect (^multi (#try.Success actual)
-                                  (n.= expected actual)))))))
+  [(do {! random.monad}
+     [dummy random.nat
+      expected (|> random.nat (random.only (|>> (n.= dummy) not)))]
+     (_.cover <coverage>
+              (|> (/.run <parser>
+                         <sample>)
+                  (!expect (^multi (#try.Success actual)
+                                   (n.= expected actual))))))])
 
 (template: (!cover/2 <coverage> <parser> <sample0> <sample1>)
-  (do {! random.monad}
-    [dummy random.nat
-     expected (|> random.nat (random.only (|>> (n.= dummy) not)))]
-    (_.cover <coverage>
-             (and (|> (/.run <parser> <sample0>)
-                      (!expect (^multi (#try.Success actual)
-                                       (n.= expected actual))))
-                  (|> (/.run <parser> <sample1>)
-                      (!expect (^multi (#try.Success actual)
-                                       (n.= expected actual))))))))
+  [(do {! random.monad}
+     [dummy random.nat
+      expected (|> random.nat (random.only (|>> (n.= dummy) not)))]
+     (_.cover <coverage>
+              (and (|> (/.run <parser> <sample0>)
+                       (!expect (^multi (#try.Success actual)
+                                        (n.= expected actual))))
+                   (|> (/.run <parser> <sample1>)
+                       (!expect (^multi (#try.Success actual)
+                                        (n.= expected actual)))))))])
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Parser])
diff --git a/stdlib/source/test/lux/control/parser/type.lux b/stdlib/source/test/lux/control/parser/type.lux
index c4c1ed0fa..971ccd5db 100644
--- a/stdlib/source/test/lux/control/parser/type.lux
+++ b/stdlib/source/test/lux/control/parser/type.lux
@@ -21,12 +21,12 @@
     ["/#" //]]])
 
 (template: (!expect <pattern> <value>)
-  (case <value>
-    <pattern>
-    true
-    
-    _
-    false))
+  [(case <value>
+     <pattern>
+     true
+     
+     _
+     false)])
 
 (def: primitive
   (Random Type)
@@ -185,7 +185,7 @@
                                            (is? not_polymorphic bodyT))))))
         )))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Parser])
diff --git a/stdlib/source/test/lux/control/parser/xml.lux b/stdlib/source/test/lux/control/parser/xml.lux
index ac3432fee..6269cafd5 100644
--- a/stdlib/source/test/lux/control/parser/xml.lux
+++ b/stdlib/source/test/lux/control/parser/xml.lux
@@ -27,24 +27,24 @@
     ["/#" // ("#\." monad)]]])
 
 (template: (!expect <pattern> <value>)
-  (case <value>
-    <pattern>
-    true
-    
-    _
-    false))
+  [(case <value>
+     <pattern>
+     true
+     
+     _
+     false)])
 
 (template: (!failure <exception> <cases>)
-  (with_expansions [<<cases>> (template.spliced <cases>)]
-    (do {! random.monad}
-      [expected (random.ascii/alpha 1)]
-      (_.cover [<exception>]
-               (`` (and (~~ (template [<parser> <input>]
-                              [(|> (/.run <parser> (list <input>))
-                                   (!expect (^multi (#try.Failure error)
-                                                    (exception.match? <exception> error))))]
+  [(with_expansions [<<cases>> (template.spliced <cases>)]
+     (do {! random.monad}
+       [expected (random.ascii/alpha 1)]
+       (_.cover [<exception>]
+                (`` (and (~~ (template [<parser> <input>]
+                               [(|> (/.run <parser> (list <input>))
+                                    (!expect (^multi (#try.Failure error)
+                                                     (exception.match? <exception> error))))]
 
-                              <<cases>>))))))))
+                               <<cases>>)))))))])
 
 (def: random_label
   (Random Name)
@@ -54,7 +54,7 @@
 (def: random_tag ..random_label)
 (def: random_attribute ..random_label)
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Parser])
diff --git a/stdlib/source/test/lux/control/pipe.lux b/stdlib/source/test/lux/control/pipe.lux
index e38fafba4..27e92a7e0 100644
--- a/stdlib/source/test/lux/control/pipe.lux
+++ b/stdlib/source/test/lux/control/pipe.lux
@@ -16,7 +16,7 @@
   [\\library
    ["." /]])
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do {! random.monad}
diff --git a/stdlib/source/test/lux/control/reader.lux b/stdlib/source/test/lux/control/reader.lux
index 833399ba7..08d5d82b2 100644
--- a/stdlib/source/test/lux/control/reader.lux
+++ b/stdlib/source/test/lux/control/reader.lux
@@ -27,7 +27,7 @@
   (function (_ == left right)
     (== (/.run [] left) (/.run [] right))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Reader])
diff --git a/stdlib/source/test/lux/control/region.lux b/stdlib/source/test/lux/control/region.lux
index 3e2bc2610..477f42a47 100644
--- a/stdlib/source/test/lux/control/region.lux
+++ b/stdlib/source/test/lux/control/region.lux
@@ -76,7 +76,7 @@
       _
       false)))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Region])
diff --git a/stdlib/source/test/lux/control/remember.lux b/stdlib/source/test/lux/control/remember.lux
index 098ecaa28..24e483420 100644
--- a/stdlib/source/test/lux/control/remember.lux
+++ b/stdlib/source/test/lux/control/remember.lux
@@ -104,7 +104,7 @@
                                  false)
                                )))))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do random.monad
diff --git a/stdlib/source/test/lux/control/security/capability.lux b/stdlib/source/test/lux/control/security/capability.lux
index 6e2e5cd77..8c0a42952 100644
--- a/stdlib/source/test/lux/control/security/capability.lux
+++ b/stdlib/source/test/lux/control/security/capability.lux
@@ -21,7 +21,7 @@
 (/.capability: Can_IO
   (can_io [] (IO Nat)))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do random.monad
diff --git a/stdlib/source/test/lux/control/security/policy.lux b/stdlib/source/test/lux/control/security/policy.lux
index e1cae710a..5c2f1bf67 100644
--- a/stdlib/source/test/lux/control/security/policy.lux
+++ b/stdlib/source/test/lux/control/security/policy.lux
@@ -66,7 +66,7 @@
           (def: privilege
             privilege))))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Policy
diff --git a/stdlib/source/test/lux/control/state.lux b/stdlib/source/test/lux/control/state.lux
index 6c4bf6dc7..d7555e7aa 100644
--- a/stdlib/source/test/lux/control/state.lux
+++ b/stdlib/source/test/lux/control/state.lux
@@ -121,7 +121,7 @@
                               (n.= (n.+ left right) output')))))
       )))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       ($_ _.and
diff --git a/stdlib/source/test/lux/control/thread.lux b/stdlib/source/test/lux/control/thread.lux
index b7af2183f..e396a613f 100644
--- a/stdlib/source/test/lux/control/thread.lux
+++ b/stdlib/source/test/lux/control/thread.lux
@@ -26,7 +26,7 @@
   (function (_ == left right)
     (== (/.run left) (/.run right))))
 
-(def: #export test
+(def: .public test
   Test
   (do random.monad
     [sample random.nat
diff --git a/stdlib/source/test/lux/control/try.lux b/stdlib/source/test/lux/control/try.lux
index 7715dc434..0e2fa479e 100644
--- a/stdlib/source/test/lux/control/try.lux
+++ b/stdlib/source/test/lux/control/try.lux
@@ -30,13 +30,13 @@
   (function (_ ==)
     (\ (/.equivalence ==) =)))
 
-(def: #export (attempt element)
+(def: .public (attempt element)
   (All [a] (-> (Random a) (Random (Try a))))
   ($_ random.or
       (random.unicode 1)
       element))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Try])
diff --git a/stdlib/source/test/lux/control/writer.lux b/stdlib/source/test/lux/control/writer.lux
index ddf6ecc00..de65f2d47 100644
--- a/stdlib/source/test/lux/control/writer.lux
+++ b/stdlib/source/test/lux/control/writer.lux
@@ -31,7 +31,7 @@
   (function (_ == [_ left] [_ right])
     (== left right)))
 
-(def: #export test
+(def: .public test
   Test
   (do random.monad
     [log (random.ascii 1)
diff --git a/stdlib/source/test/lux/data.lux b/stdlib/source/test/lux/data.lux
index 8f07c3ad5..d350cabf9 100644
--- a/stdlib/source/test/lux/data.lux
+++ b/stdlib/source/test/lux/data.lux
@@ -27,10 +27,10 @@
 
 ## TODO: Get rid of this ASAP
 (template: (!bundle body)
-  (: Test
-     (do random.monad
-       [_ (in [])]
-       body)))
+  [(: Test
+      (do random.monad
+        [_ (in [])]
+        body))])
 
 (def: format
   Test
@@ -64,7 +64,7 @@
       /sum.test
       /text.test))
 
-(def: #export test
+(def: .public test
   Test
   ## TODO: Inline ASAP
   ($_ _.and
diff --git a/stdlib/source/test/lux/data/binary.lux b/stdlib/source/test/lux/data/binary.lux
index 7b5f5fab0..3326d0055 100644
--- a/stdlib/source/test/lux/data/binary.lux
+++ b/stdlib/source/test/lux/data/binary.lux
@@ -31,7 +31,7 @@
     (#try.Success output)
     output))
 
-(def: #export (random size)
+(def: .public (random size)
   (-> Nat (Random Binary))
   (let [output (/.create size)]
     (loop [idx 0]
@@ -75,7 +75,7 @@
             (#.Item head tail))
           (list)))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do {! random.monad}
diff --git a/stdlib/source/test/lux/data/bit.lux b/stdlib/source/test/lux/data/bit.lux
index bffa5b808..58fe69ca7 100644
--- a/stdlib/source/test/lux/data/bit.lux
+++ b/stdlib/source/test/lux/data/bit.lux
@@ -16,7 +16,7 @@
   [\\library
    ["." /]])
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do random.monad
diff --git a/stdlib/source/test/lux/data/collection.lux b/stdlib/source/test/lux/data/collection.lux
index b30d8181f..0c1e1932f 100644
--- a/stdlib/source/test/lux/data/collection.lux
+++ b/stdlib/source/test/lux/data/collection.lux
@@ -52,7 +52,7 @@
       /tree/zipper.test
       ))
 
-(def: #export test
+(def: .public test
   Test
   ($_ _.and
       /array.test
diff --git a/stdlib/source/test/lux/data/collection/array.lux b/stdlib/source/test/lux/data/collection/array.lux
index dc8527fdc..9925fccec 100644
--- a/stdlib/source/test/lux/data/collection/array.lux
+++ b/stdlib/source/test/lux/data/collection/array.lux
@@ -88,7 +88,7 @@
                     (/.any? n.even? the_array)))
         )))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Array])
diff --git a/stdlib/source/test/lux/data/collection/bits.lux b/stdlib/source/test/lux/data/collection/bits.lux
index 402f52379..da4a759e5 100644
--- a/stdlib/source/test/lux/data/collection/bits.lux
+++ b/stdlib/source/test/lux/data/collection/bits.lux
@@ -19,7 +19,7 @@
   (|> random.nat
       (\ random.monad map (|>> (n.% (inc max)) (n.max min)))))
 
-(def: #export random
+(def: .public random
   (Random Bits)
   (do {! random.monad}
     [size (\ ! map (n.% 1,000) random.nat)]
@@ -29,7 +29,7 @@
           [idx (|> random.nat (\ ! map (n.% size)))]
           (in (/.set idx /.empty))))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Bits])
diff --git a/stdlib/source/test/lux/data/collection/dictionary.lux b/stdlib/source/test/lux/data/collection/dictionary.lux
index fe04241a1..aafa848b4 100644
--- a/stdlib/source/test/lux/data/collection/dictionary.lux
+++ b/stdlib/source/test/lux/data/collection/dictionary.lux
@@ -248,7 +248,7 @@
                                  (maybe.assume (/.get non_key rebound)))))))
         )))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Dictionary])
diff --git a/stdlib/source/test/lux/data/collection/dictionary/ordered.lux b/stdlib/source/test/lux/data/collection/dictionary/ordered.lux
index fb57cd70e..13971ad88 100644
--- a/stdlib/source/test/lux/data/collection/dictionary/ordered.lux
+++ b/stdlib/source/test/lux/data/collection/dictionary/ordered.lux
@@ -22,7 +22,7 @@
   [\\library
    ["." /]])
 
-(def: #export (dictionary order gen_key gen_value size)
+(def: .public (dictionary order gen_key gen_value size)
   (All [k v]
     (-> (Order k) (Random k) (Random v) Nat (Random (/.Dictionary k v))))
   (case size
@@ -37,7 +37,7 @@
        value gen_value]
       (in (/.put key value partial)))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Dictionary])
diff --git a/stdlib/source/test/lux/data/collection/dictionary/plist.lux b/stdlib/source/test/lux/data/collection/dictionary/plist.lux
index 316d7c7ce..fdbcccc06 100644
--- a/stdlib/source/test/lux/data/collection/dictionary/plist.lux
+++ b/stdlib/source/test/lux/data/collection/dictionary/plist.lux
@@ -20,7 +20,7 @@
   [\\library
    ["." /]])
 
-(def: #export (random size gen_key gen_value)
+(def: .public (random size gen_key gen_value)
   (All [v]
     (-> Nat (Random Text) (Random v) (Random (/.PList v))))
   (do random.monad
@@ -28,7 +28,7 @@
      values (random.list size gen_value)]
     (in (list.zipped/2 (set.list keys) values))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.PList])
diff --git a/stdlib/source/test/lux/data/collection/list.lux b/stdlib/source/test/lux/data/collection/list.lux
index a0c6fc685..ee6b9e7cb 100644
--- a/stdlib/source/test/lux/data/collection/list.lux
+++ b/stdlib/source/test/lux/data/collection/list.lux
@@ -389,7 +389,7 @@
                      (not (/.any? n.even? sample))))
           ))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [.List])
diff --git a/stdlib/source/test/lux/data/collection/queue.lux b/stdlib/source/test/lux/data/collection/queue.lux
index 36f6ef9a4..33ec7d9ba 100644
--- a/stdlib/source/test/lux/data/collection/queue.lux
+++ b/stdlib/source/test/lux/data/collection/queue.lux
@@ -23,7 +23,7 @@
   (Injection /.Queue)
   (|>> list /.of_list))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Queue])
diff --git a/stdlib/source/test/lux/data/collection/queue/priority.lux b/stdlib/source/test/lux/data/collection/queue/priority.lux
index 07eff44ac..42ec9677e 100644
--- a/stdlib/source/test/lux/data/collection/queue/priority.lux
+++ b/stdlib/source/test/lux/data/collection/queue/priority.lux
@@ -14,7 +14,7 @@
   [\\library
    ["." / (#+ Queue)]])
 
-(def: #export (random size)
+(def: .public (random size)
   (-> Nat (Random (Queue Nat)))
   (do {! random.monad}
     [inputs (random.list size random.nat)]
@@ -25,7 +25,7 @@
                 /.empty
                 inputs)))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Queue])
diff --git a/stdlib/source/test/lux/data/collection/row.lux b/stdlib/source/test/lux/data/collection/row.lux
index 343442e91..c57711e8e 100644
--- a/stdlib/source/test/lux/data/collection/row.lux
+++ b/stdlib/source/test/lux/data/collection/row.lux
@@ -129,7 +129,7 @@
               ))
         )))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Row])
diff --git a/stdlib/source/test/lux/data/collection/sequence.lux b/stdlib/source/test/lux/data/collection/sequence.lux
index a5ba1f1bc..c94b19ac6 100644
--- a/stdlib/source/test/lux/data/collection/sequence.lux
+++ b/stdlib/source/test/lux/data/collection/sequence.lux
@@ -29,7 +29,7 @@
        (/.take 100 reference)
        (/.take 100 subject))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Sequence])
diff --git a/stdlib/source/test/lux/data/collection/set.lux b/stdlib/source/test/lux/data/collection/set.lux
index df0c653b9..18e0a03f0 100644
--- a/stdlib/source/test/lux/data/collection/set.lux
+++ b/stdlib/source/test/lux/data/collection/set.lux
@@ -25,7 +25,7 @@
   (\ random.monad map (n.% 100)
      random.nat))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Set])
diff --git a/stdlib/source/test/lux/data/collection/set/multi.lux b/stdlib/source/test/lux/data/collection/set/multi.lux
index 37645cbed..888ea2623 100644
--- a/stdlib/source/test/lux/data/collection/set/multi.lux
+++ b/stdlib/source/test/lux/data/collection/set/multi.lux
@@ -25,7 +25,7 @@
   (Random Nat)
   (\ random.monad map (|>> (n.% 10) inc) random.nat))
 
-(def: #export (random size hash count element)
+(def: .public (random size hash count element)
   (All [a] (-> Nat (Hash a) (Random Nat) (Random a) (Random (/.Set a))))
   (do {! random.monad}
     [elements (random.set hash size element)
@@ -108,7 +108,7 @@
                             common_changes!)))
             ))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Set])
diff --git a/stdlib/source/test/lux/data/collection/set/ordered.lux b/stdlib/source/test/lux/data/collection/set/ordered.lux
index 620a63289..260d6ee39 100644
--- a/stdlib/source/test/lux/data/collection/set/ordered.lux
+++ b/stdlib/source/test/lux/data/collection/set/ordered.lux
@@ -23,7 +23,7 @@
   (random.Random Nat)
   (\ random.monad map (n.% 100) random.nat))
 
-(def: #export (random size &order gen_value)
+(def: .public (random size &order gen_value)
   (All [a] (-> Nat (Order a) (Random a) (Random (Set a))))
   (case size
     0
@@ -36,7 +36,7 @@
                           gen_value)]
       (in (/.add value partial)))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Set])
diff --git a/stdlib/source/test/lux/data/collection/stack.lux b/stdlib/source/test/lux/data/collection/stack.lux
index 6340c6fbd..082609904 100644
--- a/stdlib/source/test/lux/data/collection/stack.lux
+++ b/stdlib/source/test/lux/data/collection/stack.lux
@@ -21,7 +21,7 @@
   (Injection /.Stack)
   (/.push value /.empty))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Stack])
diff --git a/stdlib/source/test/lux/data/collection/tree.lux b/stdlib/source/test/lux/data/collection/tree.lux
index ea58f8f72..986ef566e 100644
--- a/stdlib/source/test/lux/data/collection/tree.lux
+++ b/stdlib/source/test/lux/data/collection/tree.lux
@@ -19,7 +19,7 @@
   [\\library
    ["." / (#+ Tree)]])
 
-(def: #export (tree gen_value)
+(def: .public (tree gen_value)
   (All [a] (-> (Random a) (Random [Nat (Tree a)])))
   (do {! random.monad}
     [value gen_value
@@ -31,7 +31,7 @@
          {#/.value value
           #/.children (list\map product.right children)}])))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Tree])
diff --git a/stdlib/source/test/lux/data/collection/tree/finger.lux b/stdlib/source/test/lux/data/collection/tree/finger.lux
index be46b8249..79140887d 100644
--- a/stdlib/source/test/lux/data/collection/tree/finger.lux
+++ b/stdlib/source/test/lux/data/collection/tree/finger.lux
@@ -27,7 +27,7 @@
                
                @))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Tree])
diff --git a/stdlib/source/test/lux/data/collection/tree/zipper.lux b/stdlib/source/test/lux/data/collection/tree/zipper.lux
index 756318c0b..60c18d514 100644
--- a/stdlib/source/test/lux/data/collection/tree/zipper.lux
+++ b/stdlib/source/test/lux/data/collection/tree/zipper.lux
@@ -151,7 +151,7 @@
                           (maybe.else false))))
         )))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Zipper])
diff --git a/stdlib/source/test/lux/data/color.lux b/stdlib/source/test/lux/data/color.lux
index 990eb6aea..a4fc0911e 100644
--- a/stdlib/source/test/lux/data/color.lux
+++ b/stdlib/source/test/lux/data/color.lux
@@ -23,7 +23,7 @@
   [\\library
    ["." /]])
 
-(def: #export random
+(def: .public random
   (Random /.Color)
   (|> ($_ random.and random.nat random.nat random.nat)
       (\ random.monad map /.of_rgb)))
@@ -176,7 +176,7 @@
                          [/.tetradic]))
                    )))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Color])
diff --git a/stdlib/source/test/lux/data/color/named.lux b/stdlib/source/test/lux/data/color/named.lux
index 11c699932..7f8c959b9 100644
--- a/stdlib/source/test/lux/data/color/named.lux
+++ b/stdlib/source/test/lux/data/color/named.lux
@@ -224,7 +224,7 @@
     
     <colors>)
 
-  (def: #export test
+  (def: .public test
     Test
     (<| (_.covering /._)
         (`` ($_ _.and
diff --git a/stdlib/source/test/lux/data/format/binary.lux b/stdlib/source/test/lux/data/format/binary.lux
index 547f90f63..107d95714 100644
--- a/stdlib/source/test/lux/data/format/binary.lux
+++ b/stdlib/source/test/lux/data/format/binary.lux
@@ -25,7 +25,7 @@
   (Random /.Specification)
   (\ random.monad map /.nat random.nat))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Mutation /.Specification /.Writer])
diff --git a/stdlib/source/test/lux/data/format/json.lux b/stdlib/source/test/lux/data/format/json.lux
index 1c4469df2..6ff253a73 100644
--- a/stdlib/source/test/lux/data/format/json.lux
+++ b/stdlib/source/test/lux/data/format/json.lux
@@ -31,7 +31,7 @@
   [\\library
    ["." / (#+ JSON) ("\." equivalence)]])
 
-(def: #export random
+(def: .public random
   (Random /.JSON)
   (random.rec
    (function (_ recur)
@@ -61,7 +61,7 @@
     [value (macro.gensym "string")]
     (in (list (code.text (%.code value))))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.JSON])
diff --git a/stdlib/source/test/lux/data/format/tar.lux b/stdlib/source/test/lux/data/format/tar.lux
index 34618433b..4ccec923b 100644
--- a/stdlib/source/test/lux/data/format/tar.lux
+++ b/stdlib/source/test/lux/data/format/tar.lux
@@ -391,7 +391,7 @@
                             (try.else false)))
                ))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Tar])
diff --git a/stdlib/source/test/lux/data/format/xml.lux b/stdlib/source/test/lux/data/format/xml.lux
index 1fec8a797..3ec5618a3 100644
--- a/stdlib/source/test/lux/data/format/xml.lux
+++ b/stdlib/source/test/lux/data/format/xml.lux
@@ -55,7 +55,7 @@
   (random.and (..text 0 10)
               (..text 1 10)))
 
-(def: #export random
+(def: .public random
   (Random XML)
   (random.rec (function (_ random)
                 (random.or (..text 1 10)
@@ -66,7 +66,7 @@
                                  (random.dictionary name.hash size ..identifier (..text 0 10))
                                  (random.list size random)))))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.XML])
diff --git a/stdlib/source/test/lux/data/identity.lux b/stdlib/source/test/lux/data/identity.lux
index 030d441b1..f9a4e3a76 100644
--- a/stdlib/source/test/lux/data/identity.lux
+++ b/stdlib/source/test/lux/data/identity.lux
@@ -21,7 +21,7 @@
   (function (_ ==)
     ==))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Identity])
diff --git a/stdlib/source/test/lux/data/lazy.lux b/stdlib/source/test/lux/data/lazy.lux
index c30fd3692..c9de9cb25 100644
--- a/stdlib/source/test/lux/data/lazy.lux
+++ b/stdlib/source/test/lux/data/lazy.lux
@@ -27,11 +27,11 @@
   (function (_ ==)
     (\ (/.equivalence ==) =)))
 
-(def: #export lazy
+(def: .public lazy
   (All [a] (-> (Random a) (Random (Lazy a))))
   (\ random.functor map (|>> /.lazy)))
 
-(def: #export test
+(def: .public test
   Test
   (with_expansions [<eager> (: [Nat Nat]
                                [(n.+ left right)
diff --git a/stdlib/source/test/lux/data/maybe.lux b/stdlib/source/test/lux/data/maybe.lux
index 65d405473..dd32c20db 100644
--- a/stdlib/source/test/lux/data/maybe.lux
+++ b/stdlib/source/test/lux/data/maybe.lux
@@ -25,7 +25,7 @@
   [\\library
    ["." / ("#\." monoid monad)]])
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [.Maybe])
diff --git a/stdlib/source/test/lux/data/name.lux b/stdlib/source/test/lux/data/name.lux
index e6f8b46c0..01d5131c8 100644
--- a/stdlib/source/test/lux/data/name.lux
+++ b/stdlib/source/test/lux/data/name.lux
@@ -20,12 +20,12 @@
   [\\library
    ["." /]])
 
-(def: #export (random module_size short_size)
+(def: .public (random module_size short_size)
   (-> Nat Nat (Random Name))
   (random.and (random.ascii/alpha module_size)
               (random.ascii/alpha short_size)))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do {! random.monad}
diff --git a/stdlib/source/test/lux/data/product.lux b/stdlib/source/test/lux/data/product.lux
index 2f781972d..3b846940f 100644
--- a/stdlib/source/test/lux/data/product.lux
+++ b/stdlib/source/test/lux/data/product.lux
@@ -14,7 +14,7 @@
   [\\library
    ["." /]])
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [.Tuple .And])
diff --git a/stdlib/source/test/lux/data/sum.lux b/stdlib/source/test/lux/data/sum.lux
index 73765d85f..ddb924273 100644
--- a/stdlib/source/test/lux/data/sum.lux
+++ b/stdlib/source/test/lux/data/sum.lux
@@ -20,7 +20,7 @@
   [\\library
    ["." /]])
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [.Variant .Or])
diff --git a/stdlib/source/test/lux/data/text.lux b/stdlib/source/test/lux/data/text.lux
index 5d02dbfcf..ca7f2f69f 100644
--- a/stdlib/source/test/lux/data/text.lux
+++ b/stdlib/source/test/lux/data/text.lux
@@ -258,7 +258,7 @@
                         inverse!)))
         )))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [.Text])
diff --git a/stdlib/source/test/lux/data/text/buffer.lux b/stdlib/source/test/lux/data/text/buffer.lux
index 0f6e73d35..393a20779 100644
--- a/stdlib/source/test/lux/data/text/buffer.lux
+++ b/stdlib/source/test/lux/data/text/buffer.lux
@@ -20,7 +20,7 @@
     [size (\ ! map (|>> (n.% 10) inc) random.nat)]
     (random.ascii/alpha size)))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Buffer])
diff --git a/stdlib/source/test/lux/data/text/encoding.lux b/stdlib/source/test/lux/data/text/encoding.lux
index 4cdf461b7..662643d3c 100644
--- a/stdlib/source/test/lux/data/text/encoding.lux
+++ b/stdlib/source/test/lux/data/text/encoding.lux
@@ -210,14 +210,14 @@
     
     <encodings>)
 
-  (def: #export random
+  (def: .public random
     (Random /.Encoding)
     (let [options (list.size ..all_encodings)]
       (do {! random.monad}
         [choice (\ ! map (n.% options) random.nat)]
         (in (maybe.assume (list.item choice ..all_encodings))))))
 
-  (def: #export test
+  (def: .public test
     Test
     (<| (_.covering /._)
         (_.for [/.Encoding])
diff --git a/stdlib/source/test/lux/data/text/encoding/utf8.lux b/stdlib/source/test/lux/data/text/encoding/utf8.lux
index a537a0277..ef75a174a 100644
--- a/stdlib/source/test/lux/data/text/encoding/utf8.lux
+++ b/stdlib/source/test/lux/data/text/encoding/utf8.lux
@@ -12,7 +12,7 @@
   [\\library
    ["." /]])
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.codec]
diff --git a/stdlib/source/test/lux/data/text/escape.lux b/stdlib/source/test/lux/data/text/escape.lux
index 21266b277..3b320fd90 100644
--- a/stdlib/source/test/lux/data/text/escape.lux
+++ b/stdlib/source/test/lux/data/text/escape.lux
@@ -79,7 +79,7 @@
 (syntax: (static_escape {un_escaped <code>.text})
   (in (list (code.text (/.escape un_escaped)))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       ($_ _.and
diff --git a/stdlib/source/test/lux/data/text/format.lux b/stdlib/source/test/lux/data/text/format.lux
index e8cdb1e67..e612dc9b6 100644
--- a/stdlib/source/test/lux/data/text/format.lux
+++ b/stdlib/source/test/lux/data/text/format.lux
@@ -117,7 +117,7 @@
                 ))
           )))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Format])
diff --git a/stdlib/source/test/lux/data/text/regex.lux b/stdlib/source/test/lux/data/text/regex.lux
index 95f82e502..263c6cb50 100644
--- a/stdlib/source/test/lux/data/text/regex.lux
+++ b/stdlib/source/test/lux/data/text/regex.lux
@@ -278,7 +278,7 @@
                                          (#try.Failure error)
                                          false)))])))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       ($_ _.and
diff --git a/stdlib/source/test/lux/data/text/unicode/block.lux b/stdlib/source/test/lux/data/text/unicode/block.lux
index e2a415abd..4f92f8db9 100644
--- a/stdlib/source/test/lux/data/text/unicode/block.lux
+++ b/stdlib/source/test/lux/data/text/unicode/block.lux
@@ -22,7 +22,7 @@
   [\\library
    ["." /]])
 
-(def: #export random
+(def: .public random
   (Random /.Block)
   (do {! random.monad}
     [start (\ ! map (n.% 1,000,000) random.nat)
@@ -165,7 +165,7 @@
     <blocks>
     )
 
-  (def: #export test
+  (def: .public test
     Test
     (<| (_.covering /._)
         (_.for [/.Block])
diff --git a/stdlib/source/test/lux/data/text/unicode/set.lux b/stdlib/source/test/lux/data/text/unicode/set.lux
index 0f50a1dd7..6efe6cb14 100644
--- a/stdlib/source/test/lux/data/text/unicode/set.lux
+++ b/stdlib/source/test/lux/data/text/unicode/set.lux
@@ -23,14 +23,14 @@
     [//
      ["." block]]]])
 
-(def: #export random
+(def: .public random
   (Random /.Set)
   (do {! random.monad}
     [left //block.random
      right //block.random]
     (in (/.set [left (list right)]))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Set])
diff --git a/stdlib/source/test/lux/debug.lux b/stdlib/source/test/lux/debug.lux
index a0900230d..8d9a9ef4c 100644
--- a/stdlib/source/test/lux/debug.lux
+++ b/stdlib/source/test/lux/debug.lux
@@ -226,7 +226,7 @@
 (type: My_Text
   Text)
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do random.monad
diff --git a/stdlib/source/test/lux/extension.lux b/stdlib/source/test/lux/extension.lux
index 76172c10d..117fd784a 100644
--- a/stdlib/source/test/lux/extension.lux
+++ b/stdlib/source/test/lux/extension.lux
@@ -115,7 +115,7 @@
       (`` ((~~ (static ..my_directive))))
       ))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do random.monad
diff --git a/stdlib/source/test/lux/ffi.js.lux b/stdlib/source/test/lux/ffi.js.lux
index 6e8a38684..2ba2c8f7a 100644
--- a/stdlib/source/test/lux/ffi.js.lux
+++ b/stdlib/source/test/lux/ffi.js.lux
@@ -42,7 +42,7 @@
    (new [/.String])
    (decode [Uint8Array] /.String)])
 
-(def: #export test
+(def: .public test
   Test
   (do {! random.monad}
     [boolean random.bit
diff --git a/stdlib/source/test/lux/ffi.jvm.lux b/stdlib/source/test/lux/ffi.jvm.lux
index c5f52200b..b393d363b 100644
--- a/stdlib/source/test/lux/ffi.jvm.lux
+++ b/stdlib/source/test/lux/ffi.jvm.lux
@@ -602,7 +602,7 @@
                                       ([a] invalid [] (a java/lang/String))])))))
       ))
 
-(def: #export test
+(def: .public test
   (<| (_.covering /._)
       ($_ _.and
           ..for_conversions
diff --git a/stdlib/source/test/lux/ffi.lua.lux b/stdlib/source/test/lux/ffi.lua.lux
index 963d45387..43757eedf 100644
--- a/stdlib/source/test/lux/ffi.lua.lux
+++ b/stdlib/source/test/lux/ffi.lua.lux
@@ -13,7 +13,7 @@
 
 (/.import: (os/getenv [/.String] #io #? /.String))
 
-(def: #export test
+(def: .public test
   Test
   (do {! random.monad}
     [boolean random.bit
diff --git a/stdlib/source/test/lux/ffi.old.lux b/stdlib/source/test/lux/ffi.old.lux
index 0aa631ab8..7e9301b30 100644
--- a/stdlib/source/test/lux/ffi.old.lux
+++ b/stdlib/source/test/lux/ffi.old.lux
@@ -228,7 +228,7 @@
                               (/.type (java/util/List java/lang/Byte)))))
         )))
 
-(def: #export test
+(def: .public test
   (<| (_.covering /._)
       ($_ _.and
           ..conversions
diff --git a/stdlib/source/test/lux/ffi.php.lux b/stdlib/source/test/lux/ffi.php.lux
index c8d4ea6d5..31dd43c5b 100644
--- a/stdlib/source/test/lux/ffi.php.lux
+++ b/stdlib/source/test/lux/ffi.php.lux
@@ -16,7 +16,7 @@
   [\\library
    ["." /]])
 
-(def: #export test
+(def: .public test
   Test
   (do {! random.monad}
     []
diff --git a/stdlib/source/test/lux/ffi.py.lux b/stdlib/source/test/lux/ffi.py.lux
index 18aab4188..a2f5c7444 100644
--- a/stdlib/source/test/lux/ffi.py.lux
+++ b/stdlib/source/test/lux/ffi.py.lux
@@ -16,7 +16,7 @@
    (#static R_OK /.Integer)
    (#static W_OK /.Integer)])
 
-(def: #export test
+(def: .public test
   Test
   (do {! random.monad}
     [boolean random.bit
diff --git a/stdlib/source/test/lux/ffi.rb.lux b/stdlib/source/test/lux/ffi.rb.lux
index 0b57aee7e..a6ba3d949 100644
--- a/stdlib/source/test/lux/ffi.rb.lux
+++ b/stdlib/source/test/lux/ffi.rb.lux
@@ -13,7 +13,7 @@
   ["#::."
    (#static SEPARATOR /.String)])
 
-(def: #export test
+(def: .public test
   Test
   (do {! random.monad}
     [boolean random.bit
diff --git a/stdlib/source/test/lux/ffi.scm.lux b/stdlib/source/test/lux/ffi.scm.lux
index c8d4ea6d5..31dd43c5b 100644
--- a/stdlib/source/test/lux/ffi.scm.lux
+++ b/stdlib/source/test/lux/ffi.scm.lux
@@ -16,7 +16,7 @@
   [\\library
    ["." /]])
 
-(def: #export test
+(def: .public test
   Test
   (do {! random.monad}
     []
diff --git a/stdlib/source/test/lux/locale.lux b/stdlib/source/test/lux/locale.lux
index ea6ac14e2..afc69ea50 100644
--- a/stdlib/source/test/lux/locale.lux
+++ b/stdlib/source/test/lux/locale.lux
@@ -45,7 +45,7 @@
      encoding ..random_encoding]
     (in (/.locale language (#.Some territory) (#.Some encoding)))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Locale])
diff --git a/stdlib/source/test/lux/locale/language.lux b/stdlib/source/test/lux/locale/language.lux
index 8577301d8..09f2bfc52 100644
--- a/stdlib/source/test/lux/locale/language.lux
+++ b/stdlib/source/test/lux/locale/language.lux
@@ -212,9 +212,9 @@
                          )))))
 
 (template: (!aliases <reference> <aliases>)
-  (_.cover <aliases>
-           (list.every? (\ /.equivalence = <reference>)
-                        (`` (list (~~ (template.spliced <aliases>)))))))
+  [(_.cover <aliases>
+            (list.every? (\ /.equivalence = <reference>)
+                         (`` (list (~~ (template.spliced <aliases>))))))])
 
 (def: aliases_test/0
   Test
@@ -274,7 +274,7 @@
       ..aliases_test/1
       ))
 
-(def: #export random
+(def: .public random
   (Random /.Language)
   (let [options (|> ..languages
                     (list\map (|>> (get@ #languages) set.list))
@@ -284,7 +284,7 @@
                  random.nat)]
       (in (maybe.assume (list.item choice options))))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Language])
diff --git a/stdlib/source/test/lux/locale/territory.lux b/stdlib/source/test/lux/locale/territory.lux
index a0dfbb4ee..8f323004c 100644
--- a/stdlib/source/test/lux/locale/territory.lux
+++ b/stdlib/source/test/lux/locale/territory.lux
@@ -169,9 +169,9 @@
                          )))))
 
 (template: (!aliases <reference> <aliases>)
-  (_.cover <aliases>
-           (list.every? (\ /.equivalence = <reference>)
-                        (`` (list (~~ (template.spliced <aliases>)))))))
+  [(_.cover <aliases>
+            (list.every? (\ /.equivalence = <reference>)
+                         (`` (list (~~ (template.spliced <aliases>))))))])
 
 (def: aliases_test
   Test
@@ -200,7 +200,7 @@
       (!aliases /.wallis [/.futuna])
       ))
 
-(def: #export random
+(def: .public random
   (Random /.Territory)
   (let [options (|> ..territories
                     (list\map (|>> (get@ #territories) set.list))
@@ -210,7 +210,7 @@
                  random.nat)]
       (in (maybe.assume (list.item choice options))))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Territory])
diff --git a/stdlib/source/test/lux/macro.lux b/stdlib/source/test/lux/macro.lux
index 8dc0c64db..bbc60bf4a 100644
--- a/stdlib/source/test/lux/macro.lux
+++ b/stdlib/source/test/lux/macro.lux
@@ -34,13 +34,13 @@
    ["#." template]])
 
 (template: (!expect <pattern> <value>)
-  (case <value>
-    <pattern> true
-    _ false))
+  [(case <value>
+     <pattern> true
+     _ false)])
 
 (template: (!global <definition>)
-  (: [Text .Global]
-     [(template.text [<definition>]) (#.Definition [true .Macro (' []) <definition>])]))
+  [(: [Text .Global]
+      [(template.text [<definition>]) (#.Definition [true .Macro (' []) <definition>])])])
 
 (syntax: (pow/2 number)
   (in (list (` (nat.* (~ number) (~ number))))))
@@ -115,7 +115,7 @@
      repetitions (\ ! map (nat.% 10) random.nat)
      .let [single_expansion (` (..pow/2 (..pow/2 (~ pow/1))))
            expansion (` (nat.* (..pow/2 (~ pow/1))
-                            (..pow/2 (~ pow/1))))
+                               (..pow/2 (~ pow/1))))
            full_expansion (` (nat.* (nat.* (~ pow/1) (~ pow/1))
                                     (nat.* (~ pow/1) (~ pow/1))))]]
     (`` ($_ _.and
@@ -148,7 +148,7 @@
                                 (!expect (#try.Failure _)))))
             ))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       ($_ _.and
diff --git a/stdlib/source/test/lux/macro/code.lux b/stdlib/source/test/lux/macro/code.lux
index 5d5f9121a..a5bb3a9e9 100644
--- a/stdlib/source/test/lux/macro/code.lux
+++ b/stdlib/source/test/lux/macro/code.lux
@@ -47,7 +47,7 @@
     [size (|> random.nat (\ ! map (n.% 3)))]
     (random.list size (random.and random random))))
 
-(def: #export random
+(def: .public random
   (Random Code)
   (random.rec
    (function (_ random)
@@ -164,7 +164,7 @@
                 [/.local_identifier ..random_text #.Identifier]
                 )))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       ($_ _.and
diff --git a/stdlib/source/test/lux/macro/local.lux b/stdlib/source/test/lux/macro/local.lux
index 8b8a14790..6102295d4 100644
--- a/stdlib/source/test/lux/macro/local.lux
+++ b/stdlib/source/test/lux/macro/local.lux
@@ -64,7 +64,7 @@
           (macro.full_expansion pre_expansion)
           (in (list pre_expansion)))))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do {! random.monad}
diff --git a/stdlib/source/test/lux/macro/poly.lux b/stdlib/source/test/lux/macro/poly.lux
index 90c57c87c..41eb81b4f 100644
--- a/stdlib/source/test/lux/macro/poly.lux
+++ b/stdlib/source/test/lux/macro/poly.lux
@@ -9,7 +9,7 @@
    ["#." functor]
    ["#." json]])
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       ($_ _.and
diff --git a/stdlib/source/test/lux/macro/poly/equivalence.lux b/stdlib/source/test/lux/macro/poly/equivalence.lux
index ca083482d..6bad7436a 100644
--- a/stdlib/source/test/lux/macro/poly/equivalence.lux
+++ b/stdlib/source/test/lux/macro/poly/equivalence.lux
@@ -76,7 +76,7 @@
 (derived: equivalence
   (/.equivalence Record))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.equivalence]
diff --git a/stdlib/source/test/lux/macro/poly/functor.lux b/stdlib/source/test/lux/macro/poly/functor.lux
index 6eebf2d55..b98541232 100644
--- a/stdlib/source/test/lux/macro/poly/functor.lux
+++ b/stdlib/source/test/lux/macro/poly/functor.lux
@@ -21,7 +21,7 @@
 (derived: state_functor (/.functor state.State))
 (derived: identity_functor (/.functor identity.Identity))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.cover [/.functor]
diff --git a/stdlib/source/test/lux/macro/poly/json.lux b/stdlib/source/test/lux/macro/poly/json.lux
index d688dab2f..fa8e6facb 100644
--- a/stdlib/source/test/lux/macro/poly/json.lux
+++ b/stdlib/source/test/lux/macro/poly/json.lux
@@ -113,7 +113,7 @@
 (derived: codec
   (/.codec Record))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.codec]
diff --git a/stdlib/source/test/lux/macro/syntax.lux b/stdlib/source/test/lux/macro/syntax.lux
index 49ba85da7..62988d8de 100644
--- a/stdlib/source/test/lux/macro/syntax.lux
+++ b/stdlib/source/test/lux/macro/syntax.lux
@@ -23,7 +23,7 @@
 (/.syntax: (+/3 a b c)
   (in (list (` ($_ n.+ (~ a) (~ b) (~ c))))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       ($_ _.and
diff --git a/stdlib/source/test/lux/macro/syntax/annotations.lux b/stdlib/source/test/lux/macro/syntax/annotations.lux
index cd6396535..be74194b9 100644
--- a/stdlib/source/test/lux/macro/syntax/annotations.lux
+++ b/stdlib/source/test/lux/macro/syntax/annotations.lux
@@ -22,7 +22,7 @@
   ["$." /// #_
    ["#." code]])
 
-(def: #export random
+(def: .public random
   (Random /.Annotations)
   (let [word (random.ascii/alpha 10)
         tag (random.and word word)]
@@ -30,7 +30,7 @@
       [size (\ ! map (n.% 10) random.nat)]
       (random.list size (random.and tag $///code.random)))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Annotations])
diff --git a/stdlib/source/test/lux/macro/syntax/check.lux b/stdlib/source/test/lux/macro/syntax/check.lux
index 36ad565a2..e5f3e310e 100644
--- a/stdlib/source/test/lux/macro/syntax/check.lux
+++ b/stdlib/source/test/lux/macro/syntax/check.lux
@@ -19,14 +19,14 @@
   ["$." /// #_
    ["#." code]])
 
-(def: #export random
+(def: .public random
   (Random /.Check)
   ($_ random.and
       $///code.random
       $///code.random
       ))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Check])
diff --git a/stdlib/source/test/lux/macro/syntax/declaration.lux b/stdlib/source/test/lux/macro/syntax/declaration.lux
index 0d1e61874..a260f84be 100644
--- a/stdlib/source/test/lux/macro/syntax/declaration.lux
+++ b/stdlib/source/test/lux/macro/syntax/declaration.lux
@@ -17,7 +17,7 @@
   [\\library
    ["." /]])
 
-(def: #export random
+(def: .public random
   (Random /.Declaration)
   (let [word (random.ascii/alpha 10)]
     ($_ random.and
@@ -27,7 +27,7 @@
           (random.list size word))
         )))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Declaration])
diff --git a/stdlib/source/test/lux/macro/syntax/definition.lux b/stdlib/source/test/lux/macro/syntax/definition.lux
index e6acc2847..855a44545 100644
--- a/stdlib/source/test/lux/macro/syntax/definition.lux
+++ b/stdlib/source/test/lux/macro/syntax/definition.lux
@@ -25,7 +25,7 @@
    ["#/" // #_
     ["#." code]]])
 
-(def: #export random
+(def: .public random
   (Random /.Definition)
   ($_ random.and
       (random.ascii/alpha 5)
@@ -53,7 +53,7 @@
    #.extensions      []
    #.host            []})
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Definition])
diff --git a/stdlib/source/test/lux/macro/syntax/export.lux b/stdlib/source/test/lux/macro/syntax/export.lux
index 6e93f2e4b..adb95407f 100644
--- a/stdlib/source/test/lux/macro/syntax/export.lux
+++ b/stdlib/source/test/lux/macro/syntax/export.lux
@@ -15,7 +15,7 @@
   [\\library
    ["." /]])
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do random.monad
diff --git a/stdlib/source/test/lux/macro/syntax/input.lux b/stdlib/source/test/lux/macro/syntax/input.lux
index e292cde72..fe01ab496 100644
--- a/stdlib/source/test/lux/macro/syntax/input.lux
+++ b/stdlib/source/test/lux/macro/syntax/input.lux
@@ -19,14 +19,14 @@
   ["$." /// #_
    ["#." code]])
 
-(def: #export random
+(def: .public random
   (Random /.Input)
   ($_ random.and
       $///code.random
       $///code.random
       ))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Input])
diff --git a/stdlib/source/test/lux/macro/syntax/type/variable.lux b/stdlib/source/test/lux/macro/syntax/type/variable.lux
index 48882172a..af57cc222 100644
--- a/stdlib/source/test/lux/macro/syntax/type/variable.lux
+++ b/stdlib/source/test/lux/macro/syntax/type/variable.lux
@@ -15,11 +15,11 @@
   [\\library
    ["." /]])
 
-(def: #export random
+(def: .public random
   (Random /.Variable)
   (random.ascii/alpha 10))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Variable])
diff --git a/stdlib/source/test/lux/macro/template.lux b/stdlib/source/test/lux/macro/template.lux
index ecec132d7..78df63f0d 100644
--- a/stdlib/source/test/lux/macro/template.lux
+++ b/stdlib/source/test/lux/macro/template.lux
@@ -35,7 +35,7 @@
       (#try.Success _)
       (#try.Failure "OOPS!"))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do {! random.monad}
diff --git a/stdlib/source/test/lux/math.lux b/stdlib/source/test/lux/math.lux
index 8eae10808..f1bbc7fa6 100644
--- a/stdlib/source/test/lux/math.lux
+++ b/stdlib/source/test/lux/math.lux
@@ -31,7 +31,7 @@
   (let [normal (|> angle forward backward)]
     (|> normal forward backward (f.approximately? ..margin_of_error normal))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       ($_ _.and
diff --git a/stdlib/source/test/lux/math/infix.lux b/stdlib/source/test/lux/math/infix.lux
index 2dafd35aa..9c8298346 100644
--- a/stdlib/source/test/lux/math/infix.lux
+++ b/stdlib/source/test/lux/math/infix.lux
@@ -15,7 +15,7 @@
    ["." /
     ["." //]]])
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do random.monad
diff --git a/stdlib/source/test/lux/math/logic/continuous.lux b/stdlib/source/test/lux/math/logic/continuous.lux
index ab7049221..a49e5c7d8 100644
--- a/stdlib/source/test/lux/math/logic/continuous.lux
+++ b/stdlib/source/test/lux/math/logic/continuous.lux
@@ -13,7 +13,7 @@
   [\\library
    ["." /]])
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do random.monad
diff --git a/stdlib/source/test/lux/math/logic/fuzzy.lux b/stdlib/source/test/lux/math/logic/fuzzy.lux
index bdbc790ac..f97ffb24f 100644
--- a/stdlib/source/test/lux/math/logic/fuzzy.lux
+++ b/stdlib/source/test/lux/math/logic/fuzzy.lux
@@ -332,7 +332,7 @@
                         (r.< threshold (/.membership set sample))))
         )))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Fuzzy])
diff --git a/stdlib/source/test/lux/math/modular.lux b/stdlib/source/test/lux/math/modular.lux
index cafc576eb..b87f30bb1 100644
--- a/stdlib/source/test/lux/math/modular.lux
+++ b/stdlib/source/test/lux/math/modular.lux
@@ -28,13 +28,13 @@
     ["/#" // #_
      ["#" modulus]]]])
 
-(def: #export (random modulus)
+(def: .public (random modulus)
   (All [%] (-> (//.Modulus %) (Random (/.Mod %))))
   (\ random.monad map
      (/.modular modulus)
      random.int))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Mod])
diff --git a/stdlib/source/test/lux/math/modulus.lux b/stdlib/source/test/lux/math/modulus.lux
index 7a3cde72c..365fef83d 100644
--- a/stdlib/source/test/lux/math/modulus.lux
+++ b/stdlib/source/test/lux/math/modulus.lux
@@ -25,13 +25,13 @@
                           0 +1
                           _ (.int divisor)))))))
 
-(def: #export (random range)
+(def: .public (random range)
   (Ex [%] (-> Int (Random (/.Modulus %))))
   (|> random.int
       (\ random.monad map (i.% range))
       (random.one (|>> /.modulus try.maybe))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Modulus])
diff --git a/stdlib/source/test/lux/math/number.lux b/stdlib/source/test/lux/math/number.lux
index b13fa5cf8..d97c73f45 100644
--- a/stdlib/source/test/lux/math/number.lux
+++ b/stdlib/source/test/lux/math/number.lux
@@ -28,7 +28,7 @@
   (-> Text Text)
   (text.replace_all "," ""))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       ($_ _.and
diff --git a/stdlib/source/test/lux/math/number/complex.lux b/stdlib/source/test/lux/math/number/complex.lux
index ddeb53c2f..25bdc1216 100644
--- a/stdlib/source/test/lux/math/number/complex.lux
+++ b/stdlib/source/test/lux/math/number/complex.lux
@@ -33,7 +33,7 @@
     (in (f.* (|> factor .int int.frac)
              measure))))
 
-(def: #export random
+(def: .public random
   (Random /.Complex)
   (do random.monad
     [real ..dimension
@@ -267,7 +267,7 @@
                  (list\map (/.pow' (|> degree .int int.frac)))
                  (list.every? (/.approximately? ..margin_of_error sample))))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Complex])
diff --git a/stdlib/source/test/lux/math/number/frac.lux b/stdlib/source/test/lux/math/number/frac.lux
index 7f59d94af..91f44f41b 100644
--- a/stdlib/source/test/lux/math/number/frac.lux
+++ b/stdlib/source/test/lux/math/number/frac.lux
@@ -126,7 +126,7 @@
         @.jvm (as_is <jvm>)}
        (as_is)))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [.Frac])
diff --git a/stdlib/source/test/lux/math/number/i16.lux b/stdlib/source/test/lux/math/number/i16.lux
index bc1da4832..f82250048 100644
--- a/stdlib/source/test/lux/math/number/i16.lux
+++ b/stdlib/source/test/lux/math/number/i16.lux
@@ -14,11 +14,11 @@
      ["i" int]
      ["#." i64]]]])
 
-(def: #export random
+(def: .public random
   (Random /.I16)
   (\ random.functor map /.i16 random.i64))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.I16])
diff --git a/stdlib/source/test/lux/math/number/i32.lux b/stdlib/source/test/lux/math/number/i32.lux
index 211156ef2..a4c503bf7 100644
--- a/stdlib/source/test/lux/math/number/i32.lux
+++ b/stdlib/source/test/lux/math/number/i32.lux
@@ -14,11 +14,11 @@
      ["i" int]
      ["#." i64]]]])
 
-(def: #export random
+(def: .public random
   (Random /.I32)
   (\ random.functor map /.i32 random.i64))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.I32])
diff --git a/stdlib/source/test/lux/math/number/i64.lux b/stdlib/source/test/lux/math/number/i64.lux
index ddc907939..3504af6f7 100644
--- a/stdlib/source/test/lux/math/number/i64.lux
+++ b/stdlib/source/test/lux/math/number/i64.lux
@@ -159,7 +159,7 @@
              ($monoid.spec n.equivalence /.conjunction random.nat))
       ))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [.I64])
diff --git a/stdlib/source/test/lux/math/number/i8.lux b/stdlib/source/test/lux/math/number/i8.lux
index 6bd0a3c9f..2764f93ec 100644
--- a/stdlib/source/test/lux/math/number/i8.lux
+++ b/stdlib/source/test/lux/math/number/i8.lux
@@ -14,11 +14,11 @@
      ["i" int]
      ["#." i64]]]])
 
-(def: #export random
+(def: .public random
   (Random /.I8)
   (\ random.functor map /.i8 random.i64))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.I8])
diff --git a/stdlib/source/test/lux/math/number/int.lux b/stdlib/source/test/lux/math/number/int.lux
index 6d8d2340b..6fba4351a 100644
--- a/stdlib/source/test/lux/math/number/int.lux
+++ b/stdlib/source/test/lux/math/number/int.lux
@@ -73,7 +73,7 @@
                         (not (/.odd? sample))))
         )))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [.Int])
diff --git a/stdlib/source/test/lux/math/number/nat.lux b/stdlib/source/test/lux/math/number/nat.lux
index 9b2a8d676..d6e64603e 100644
--- a/stdlib/source/test/lux/math/number/nat.lux
+++ b/stdlib/source/test/lux/math/number/nat.lux
@@ -62,7 +62,7 @@
                         (not (/.odd? sample))))
         )))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [.Nat])
diff --git a/stdlib/source/test/lux/math/number/ratio.lux b/stdlib/source/test/lux/math/number/ratio.lux
index c30830474..baf9f23a1 100644
--- a/stdlib/source/test/lux/math/number/ratio.lux
+++ b/stdlib/source/test/lux/math/number/ratio.lux
@@ -25,7 +25,7 @@
      (|>> (n.% 1,000,000) (n.max 1))
      random.nat))
 
-(def: #export random
+(def: .public random
   (Random /.Ratio)
   (do random.monad
     [numerator ..part
@@ -33,7 +33,7 @@
                               ..part)]
     (in (/.ratio numerator denominator))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Ratio])
diff --git a/stdlib/source/test/lux/math/number/rev.lux b/stdlib/source/test/lux/math/number/rev.lux
index 3c9d07138..b0d857464 100644
--- a/stdlib/source/test/lux/math/number/rev.lux
+++ b/stdlib/source/test/lux/math/number/rev.lux
@@ -53,7 +53,7 @@
                 ))
           )))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [.Rev])
diff --git a/stdlib/source/test/lux/meta.lux b/stdlib/source/test/lux/meta.lux
index 45a6b5b10..9684fd3f6 100644
--- a/stdlib/source/test/lux/meta.lux
+++ b/stdlib/source/test/lux/meta.lux
@@ -35,9 +35,9 @@
    ["#." location]])
 
 (template: (!expect <pattern> <value>)
-  (case <value>
-    <pattern> true
-    _ false))
+  [(case <value>
+     <pattern> true
+     _ false)])
 
 (def: compiler_related
   Test
@@ -886,7 +886,7 @@
       _
       false)))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [.Meta .Lux])
diff --git a/stdlib/source/test/lux/meta/annotation.lux b/stdlib/source/test/lux/meta/annotation.lux
index 55a97ca60..e0fa2d3e5 100644
--- a/stdlib/source/test/lux/meta/annotation.lux
+++ b/stdlib/source/test/lux/meta/annotation.lux
@@ -46,9 +46,9 @@
     (random.list size (random.and random random))))
 
 (template: (!expect <pattern> <value>)
-  (case <value>
-    <pattern> true
-    _ false))
+  [(case <value>
+     <pattern> true
+     _ false)])
 
 (def: (annotation key value)
   (-> Name Code /.Annotation)
@@ -142,7 +142,7 @@
                   ))
             ))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Annotation])
diff --git a/stdlib/source/test/lux/meta/location.lux b/stdlib/source/test/lux/meta/location.lux
index 421c872dd..b7172f4c1 100644
--- a/stdlib/source/test/lux/meta/location.lux
+++ b/stdlib/source/test/lux/meta/location.lux
@@ -16,7 +16,7 @@
    [macro
     ["#." code]]])
 
-(def: #export random
+(def: .public random
   (Random Location)
   ($_ random.and
       (random.ascii/alpha 10)
@@ -24,7 +24,7 @@
       random.nat
       ))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [.Location])
diff --git a/stdlib/source/test/lux/program.lux b/stdlib/source/test/lux/program.lux
index c7b4cf98c..df55e17f4 100644
--- a/stdlib/source/test/lux/program.lux
+++ b/stdlib/source/test/lux/program.lux
@@ -26,7 +26,7 @@
                                              <code>.any)})
   (in (list actual_program)))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do random.monad
diff --git a/stdlib/source/test/lux/target.lux b/stdlib/source/test/lux/target.lux
index c59dc9025..2f30bc909 100644
--- a/stdlib/source/test/lux/target.lux
+++ b/stdlib/source/test/lux/target.lux
@@ -35,7 +35,7 @@
     (n.= (list.size ..all)
          (set.size ..unique)))
 
-  (def: #export test
+  (def: .public test
     Test
     (<| (_.covering /._)
         (_.for [/.Target])
diff --git a/stdlib/source/test/lux/target/jvm.lux b/stdlib/source/test/lux/target/jvm.lux
index 9d9e17c80..e6cfcf082 100644
--- a/stdlib/source/test/lux/target/jvm.lux
+++ b/stdlib/source/test/lux/target/jvm.lux
@@ -321,15 +321,15 @@
 
 (template [<name> <type>]
   [(template: (<name> <old_extension> <new_extension>)
-     (: (-> <type> <type> <type>)
-        (function (_ parameter subject)
-          (for {@.old
-                (<old_extension> subject parameter)
-                
-                @.jvm
-                ("jvm object cast"
-                 (<new_extension> ("jvm object cast" parameter)
-                                  ("jvm object cast" subject)))}))))]
+     [(: (-> <type> <type> <type>)
+         (function (_ parameter subject)
+           (for {@.old
+                 (<old_extension> subject parameter)
+                 
+                 @.jvm
+                 ("jvm object cast"
+                  (<new_extension> ("jvm object cast" parameter)
+                                   ("jvm object cast" subject)))})))])]
 
   [int/2 java/lang/Integer]
   [long/2 java/lang/Long]
@@ -338,15 +338,15 @@
   )
 
 (template: (int+long/2 <old_extension> <new_extension>)
-  (: (-> java/lang/Integer java/lang/Long java/lang/Long)
-     (function (_ parameter subject)
-       (for {@.old
-             (<old_extension> subject parameter)
-             
-             @.jvm
-             ("jvm object cast"
-              (<new_extension> ("jvm object cast" parameter)
-                               ("jvm object cast" subject)))}))))
+  [(: (-> java/lang/Integer java/lang/Long java/lang/Long)
+      (function (_ parameter subject)
+        (for {@.old
+              (<old_extension> subject parameter)
+              
+              @.jvm
+              ("jvm object cast"
+               (<new_extension> ("jvm object cast" parameter)
+                                ("jvm object cast" subject)))})))])
 
 (def: int
   Test
@@ -1037,13 +1037,13 @@
         )))
 
 (template: (!::= <type> <old> <new>)
-  (: (-> <type> Any Bit)
-     (function (_ expected)
-       (for {@.old
-             (|>> (:as <type>) (<old> expected))
-             
-             @.jvm
-             (|>> (:as <type>) "jvm object cast" (<new> ("jvm object cast" (:as <type> expected))))}))))
+  [(: (-> <type> Any Bit)
+      (function (_ expected)
+        (for {@.old
+              (|>> (:as <type>) (<old> expected))
+              
+              @.jvm
+              (|>> (:as <type>) "jvm object cast" (<new> ("jvm object cast" (:as <type> expected))))})))])
 
 (def: conversion
   Test
@@ -1719,7 +1719,7 @@
               (#try.Failure error)
               false))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.context (%.name (name_of .._)))
       ($_ _.and
diff --git a/stdlib/source/test/lux/test.lux b/stdlib/source/test/lux/test.lux
index 543eb94cd..574feb176 100644
--- a/stdlib/source/test/lux/test.lux
+++ b/stdlib/source/test/lux/test.lux
@@ -163,7 +163,7 @@
                                ran_all_tests!))))))
       ))
 
-(def: #export dummy_target
+(def: .public dummy_target
   "YOLO")
 
 (def: coverage
@@ -215,7 +215,7 @@
                                   (set.member? (get@ #/.actual_coverage covering) (name_of ..dummy_target))))))))
       ))
 
-(def: #export test
+(def: .public test
   /.Test
   (<| (/.covering /._)
       (/.for [/.Test])
diff --git a/stdlib/source/test/lux/time.lux b/stdlib/source/test/lux/time.lux
index 91711a048..e87761302 100644
--- a/stdlib/source/test/lux/time.lux
+++ b/stdlib/source/test/lux/time.lux
@@ -106,7 +106,7 @@
                                 (#try.Failure error) false)))
             ))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Time])
diff --git a/stdlib/source/test/lux/time/date.lux b/stdlib/source/test/lux/time/date.lux
index 8e77300da..10c44e678 100644
--- a/stdlib/source/test/lux/time/date.lux
+++ b/stdlib/source/test/lux/time/date.lux
@@ -25,7 +25,7 @@
   [\\library
    ["." /]])
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Date])
diff --git a/stdlib/source/test/lux/time/day.lux b/stdlib/source/test/lux/time/day.lux
index e65759f92..dd71f0f93 100644
--- a/stdlib/source/test/lux/time/day.lux
+++ b/stdlib/source/test/lux/time/day.lux
@@ -25,7 +25,7 @@
   [\\library
    ["." /]])
 
-(def: #export random
+(def: .public random
   (Random /.Day)
   (random.either (random.either (random.either (random\in #/.Sunday)
                                                (random\in #/.Monday))
@@ -35,7 +35,7 @@
                                                (random\in #/.Friday))
                                 (random\in #/.Saturday))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Day])
diff --git a/stdlib/source/test/lux/time/duration.lux b/stdlib/source/test/lux/time/duration.lux
index 1493cfd21..b43ef18bd 100644
--- a/stdlib/source/test/lux/time/duration.lux
+++ b/stdlib/source/test/lux/time/duration.lux
@@ -20,7 +20,7 @@
   [\\library
    ["." /]])
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Duration])
diff --git a/stdlib/source/test/lux/time/instant.lux b/stdlib/source/test/lux/time/instant.lux
index f737f7827..c48ae6955 100644
--- a/stdlib/source/test/lux/time/instant.lux
+++ b/stdlib/source/test/lux/time/instant.lux
@@ -24,7 +24,7 @@
   [\\library
    ["." /]])
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Instant])
diff --git a/stdlib/source/test/lux/time/month.lux b/stdlib/source/test/lux/time/month.lux
index ec1c8134c..03c50086f 100644
--- a/stdlib/source/test/lux/time/month.lux
+++ b/stdlib/source/test/lux/time/month.lux
@@ -27,14 +27,14 @@
     [//
      ["." duration]]]])
 
-(def: #export random
+(def: .public random
   (Random /.Month)
   (let [december (/.number #/.December)]
     (|> random.nat
         (\ random.monad map (|>> (n.% december) inc))
         (random.one (|>> /.by_number try.maybe)))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Month])
diff --git a/stdlib/source/test/lux/time/year.lux b/stdlib/source/test/lux/time/year.lux
index 84ed24fc4..366cc8bc2 100644
--- a/stdlib/source/test/lux/time/year.lux
+++ b/stdlib/source/test/lux/time/year.lux
@@ -27,11 +27,11 @@
      ["#." instant]
      ["#." date]]]])
 
-(def: #export random
+(def: .public random
   (Random /.Year)
   (random.one (|>> /.year try.maybe) random.int))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Year])
diff --git a/stdlib/source/test/lux/tool.lux b/stdlib/source/test/lux/tool.lux
index ebda4eb93..5aaee9637 100644
--- a/stdlib/source/test/lux/tool.lux
+++ b/stdlib/source/test/lux/tool.lux
@@ -11,7 +11,7 @@
        ["#." analysis]
        ["#." synthesis]]]]]])
 
-(def: #export test
+(def: .public test
   Test
   ($_ _.and
       /syntax.test
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis.lux
index 06b09fbf9..f2b318a33 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis.lux
@@ -12,7 +12,7 @@
      [analysis
       ["#." lux]]]]])
 
-(def: #export test
+(def: .public test
   Test
   ($_ _.and
       /primitive.test
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/case.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/case.lux
index 752465bd0..ac408d71d 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/case.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/case.lux
@@ -53,7 +53,7 @@
        head head+]
       (in (#.Item head tail+)))))
 
-(def: #export (exhaustive_branches allow_literals? variantTC inputC)
+(def: .public (exhaustive_branches allow_literals? variantTC inputC)
   (-> Bit (List [Code Code]) Code (Random (List Code)))
   (case inputC
     [_ (#.Bit _)]
@@ -116,7 +116,7 @@
     (r\in (list))
     ))
 
-(def: #export (input variant_tags record_tags primitivesC)
+(def: .public (input variant_tags record_tags primitivesC)
   (-> (List Code) (List Code) (List Code) (Random Code))
   (r.rec
    (function (_ input)
@@ -138,7 +138,7 @@
   (-> Code Code [Code Code])
   [pattern body])
 
-(def: #export test
+(def: .public test
   (<| (_.context (name.module (name_of /._)))
       (do {! r.monad}
         [module_name (r.unicode 5)
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/function.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/function.lux
index 08bfc6e99..7981f1422 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/function.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/function.lux
@@ -123,7 +123,7 @@
                         (check_apply partial_polyT2 var_idx)))
             ))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.context (name.module (name_of /._)))
       ($_ _.and
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/primitive.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/primitive.lux
index 7fb549845..3b93ae562 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/primitive.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/primitive.lux
@@ -32,25 +32,25 @@
         [meta
          ["." archive]]]]]]]])
 
-(def: #export (expander macro inputs state)
+(def: .public (expander macro inputs state)
   Expander
   (#try.Failure "NOPE"))
 
-(def: #export (eval archive count type expression)
+(def: .public (eval archive count type expression)
   Eval
   (function (_ state)
     (#try.Failure "NO!")))
 
-(def: #export phase
+(def: .public phase
   ////analysis.Phase
   (//.phase ..expander))
 
-(def: #export state
+(def: .public state
   ////analysis.State+
   [(///analysis.bundle ..eval bundle.empty)
    (////analysis.state (////analysis.info version.version @.jvm))])
 
-(def: #export primitive
+(def: .public primitive
   (Random [Type Code])
   (`` ($_ r.either
           (~~ (template [<type> <code_wrapper> <value_gen>]
@@ -83,7 +83,7 @@
              (#try.Failure error)
              (#try.Failure error))))
 
-(def: #export test
+(def: .public test
   (<| (_.context (name.module (name_of /._)))
       (`` ($_ _.and
               (_.test (%.name (name_of #////analysis.Unit))
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/reference.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/reference.lux
index e1f52e584..2d1a34d1b 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/reference.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/reference.lux
@@ -62,7 +62,7 @@
       (phase.run _primitive.state)
       check!))
 
-(def: #export test
+(def: .public test
   (<| (_.context (name.module (name_of /._)))
       (do r.monad
         [[expectedT _] _primitive.primitive
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/structure.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/structure.lux
index 11ca2b276..9bc61107b 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/structure.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/structure.lux
@@ -39,7 +39,7 @@
          ["." archive]]]]]]]])
 
 (template [<name> <on_success> <on_error>]
-  [(def: #export <name>
+  [(def: .public <name>
      (All [a] (-> (Operation a) Bit))
      (|>> (phase.run _primitive.state)
           (case> (#try.Success _)
@@ -298,7 +298,7 @@
                 (|> (/.record archive.empty _primitive.phase recordC)
                     (check_record module_name tags monoT monoT size))))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.context (name.module (name_of /._)))
       ($_ _.and
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux
index a0643cbcd..508eed47f 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux
@@ -191,7 +191,7 @@
                 (check_success+ "lux io current-time" (list) Int))
         )))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.context (name.module (name_of /._)))
       ($_ _.and
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis.lux
index 4a7a7c507..159790e36 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis.lux
@@ -9,7 +9,7 @@
    ["#." loop]
    ["#." variable]])
 
-(def: #export test
+(def: .public test
   Test
   ($_ _.and
       /primitive.test
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/case.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/case.lux
index 59cad9258..7a5b44f51 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/case.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/case.lux
@@ -340,7 +340,7 @@
                         _
                         false)))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.synthesize])
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/function.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/function.lux
index 60a009be1..188c50a86 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/function.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/function.lux
@@ -455,7 +455,7 @@
                       (!expect (^multi (#try.Success funcS)
                                        (//primitive.corresponds? funcA funcS))))))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       ($_ _.and
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/loop.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/loop.lux
index 3598bbf7c..9aa7bdfe9 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/loop.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/loop.lux
@@ -261,7 +261,7 @@
       (..extension offset arity next)
       ))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       ($_ _.and
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/primitive.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/primitive.lux
index e4ccec535..25524e590 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/primitive.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/primitive.lux
@@ -27,7 +27,7 @@
         [meta
          ["." archive]]]]]]]])
 
-(def: #export primitive
+(def: .public primitive
   (Random Analysis)
   (do r.monad
     [primitive (: (Random ////analysis.Primitive)
@@ -41,7 +41,7 @@
                       (r.unicode 5)))]
     (in (#////analysis.Primitive primitive))))
 
-(def: #export (corresponds? analysis synthesis)
+(def: .public (corresponds? analysis synthesis)
   (-> Analysis Synthesis Bit)
   (`` (case [analysis synthesis]
         (~~ (template [<analysis> <post_analysis> <synthesis> <post_synthesis>]
@@ -70,7 +70,7 @@
         _
         false)))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.context (%.name (name_of #////synthesis.Primitive)))
       (`` ($_ _.and
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/structure.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/structure.lux
index a45c8af9e..4db00f1f2 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/structure.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/structure.lux
@@ -72,7 +72,7 @@
                        _
                        false)))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.context (%.name (name_of #////synthesis.Structure)))
       ($_ _.and
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/variable.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/variable.lux
index 04fb82336..cb0d81cfd 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/variable.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/variable.lux
@@ -322,7 +322,7 @@
   {#redundants 0
    #necessary (dictionary.empty n.hash)})
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       ($_ _.and
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/syntax.lux b/stdlib/source/test/lux/tool/compiler/language/lux/syntax.lux
index 7a103d60a..e5a1e45d3 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/syntax.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/syntax.lux
@@ -137,7 +137,7 @@
                   (\ code.equivalence = parsed sample)))
         )))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.context (name.module (name_of /._)))
       ($_ _.and
diff --git a/stdlib/source/test/lux/type.lux b/stdlib/source/test/lux/type.lux
index f248a2adb..171f34873 100644
--- a/stdlib/source/test/lux/type.lux
+++ b/stdlib/source/test/lux/type.lux
@@ -41,7 +41,7 @@
   (Random Name)
   (random.and ..short ..short))
 
-(def: #export random
+(def: .public random
   (Random Type)
   (random.rec
    (function (_ recur)
@@ -62,7 +62,7 @@
            (random.and ..name recur)
            )))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       ($_ _.and
diff --git a/stdlib/source/test/lux/type/abstract.lux b/stdlib/source/test/lux/type/abstract.lux
index 2b96f6788..1b70b0fd2 100644
--- a/stdlib/source/test/lux/type/abstract.lux
+++ b/stdlib/source/test/lux/type/abstract.lux
@@ -45,12 +45,16 @@
          (with_expansions [no_current! (..with_no_active_frames (..current))
                            no_specific! (..with_no_active_frames (..specific))]
            (/.abstract: (g!Foo a)
+             {}
+
              Text
 
              (/.abstract: (g!Bar a)
+               {}
+
                Nat
 
-               (def: #export test
+               (def: .public test
                  Test
                  (<| (_.covering /._)
                      (_.for [/.abstract:])
diff --git a/stdlib/source/test/lux/type/check.lux b/stdlib/source/test/lux/type/check.lux
index 84426d1f7..eaa8cbb86 100644
--- a/stdlib/source/test/lux/type/check.lux
+++ b/stdlib/source/test/lux/type/check.lux
@@ -700,7 +700,7 @@
                       (try.else false))
                   ))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Check])
diff --git a/stdlib/source/test/lux/type/dynamic.lux b/stdlib/source/test/lux/type/dynamic.lux
index 0c743cabf..04c25fb70 100644
--- a/stdlib/source/test/lux/type/dynamic.lux
+++ b/stdlib/source/test/lux/type/dynamic.lux
@@ -17,7 +17,7 @@
   [\\library
    ["." /]])
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Dynamic])
diff --git a/stdlib/source/test/lux/type/implicit.lux b/stdlib/source/test/lux/type/implicit.lux
index 6795b8aec..d032f19c5 100644
--- a/stdlib/source/test/lux/type/implicit.lux
+++ b/stdlib/source/test/lux/type/implicit.lux
@@ -21,7 +21,7 @@
 
 (/.implicit: [n.multiplication])
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do {! random.monad}
diff --git a/stdlib/source/test/lux/type/quotient.lux b/stdlib/source/test/lux/type/quotient.lux
index b59879ef2..ae137a428 100644
--- a/stdlib/source/test/lux/type/quotient.lux
+++ b/stdlib/source/test/lux/type/quotient.lux
@@ -16,7 +16,7 @@
   [\\library
    ["." /]])
 
-(def: #export (random class super)
+(def: .public (random class super)
   (All [t c %] (-> (/.Class t c %) (Random t) (Random (/.Quotient t c %))))
   (\ random.monad map (/.quotient class) super))
 
@@ -26,7 +26,7 @@
 (def: Mod_10
   (/.type ..mod_10_class))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do random.monad
diff --git a/stdlib/source/test/lux/type/refinement.lux b/stdlib/source/test/lux/type/refinement.lux
index 1dd71a4c6..da5826098 100644
--- a/stdlib/source/test/lux/type/refinement.lux
+++ b/stdlib/source/test/lux/type/refinement.lux
@@ -22,7 +22,7 @@
 (def: _type
   (/.type _refiner))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Refined])
diff --git a/stdlib/source/test/lux/type/resource.lux b/stdlib/source/test/lux/type/resource.lux
index 791c31e1f..18ee0164d 100644
--- a/stdlib/source/test/lux/type/resource.lux
+++ b/stdlib/source/test/lux/type/resource.lux
@@ -167,7 +167,7 @@
                                   (#try.Failure error)
                                   true)))]))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Procedure])
diff --git a/stdlib/source/test/lux/type/unit.lux b/stdlib/source/test/lux/type/unit.lux
index 32e2922a6..fa9a53c5f 100644
--- a/stdlib/source/test/lux/type/unit.lux
+++ b/stdlib/source/test/lux/type/unit.lux
@@ -182,7 +182,7 @@
                          (meter\= right)))
             ))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Qty])
diff --git a/stdlib/source/test/lux/type/variance.lux b/stdlib/source/test/lux/type/variance.lux
index b0987e833..e683b1f64 100644
--- a/stdlib/source/test/lux/type/variance.lux
+++ b/stdlib/source/test/lux/type/variance.lux
@@ -17,7 +17,7 @@
 (type: Sub
   (Super Bit))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       ($_ _.and
diff --git a/stdlib/source/test/lux/world.lux b/stdlib/source/test/lux/world.lux
index 795b3e55c..4750e0371 100644
--- a/stdlib/source/test/lux/world.lux
+++ b/stdlib/source/test/lux/world.lux
@@ -17,7 +17,7 @@
      ["#/." client]
      ["#/." status]]]])
 
-(def: #export test
+(def: .public test
   Test
   ($_ _.and
       /file.test
diff --git a/stdlib/source/test/lux/world/console.lux b/stdlib/source/test/lux/world/console.lux
index c51cce645..c358ca699 100644
--- a/stdlib/source/test/lux/world/console.lux
+++ b/stdlib/source/test/lux/world/console.lux
@@ -48,7 +48,7 @@
        (exception.except ..dead [])
        (#try.Success [true content])))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       ($_ _.and
diff --git a/stdlib/source/test/lux/world/file.lux b/stdlib/source/test/lux/world/file.lux
index ecc596399..99155f805 100644
--- a/stdlib/source/test/lux/world/file.lux
+++ b/stdlib/source/test/lux/world/file.lux
@@ -15,7 +15,7 @@
   [\\specification
    ["$." /]])
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do {! random.monad}
diff --git a/stdlib/source/test/lux/world/file/watch.lux b/stdlib/source/test/lux/world/file/watch.lux
index c5b89533b..6f70358e5 100644
--- a/stdlib/source/test/lux/world/file/watch.lux
+++ b/stdlib/source/test/lux/world/file/watch.lux
@@ -149,7 +149,7 @@
                false)
              (list.empty? poll/3')))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Watcher])
diff --git a/stdlib/source/test/lux/world/input/keyboard.lux b/stdlib/source/test/lux/world/input/keyboard.lux
index bfcc0db6c..c9c6cfee3 100644
--- a/stdlib/source/test/lux/world/input/keyboard.lux
+++ b/stdlib/source/test/lux/world/input/keyboard.lux
@@ -135,14 +135,14 @@
     
     <groups>)
 
-  (def: #export random
+  (def: .public random
     (Random /.Key)
     (let [count (list.size ..listing)]
       (do {! random.monad}
         [choice (\ ! map (n.% count) random.nat)]
         (in (maybe.assume (list.item choice ..listing))))))
 
-  (def: #export test
+  (def: .public test
     Test
     (<| (_.covering /._)
         (_.for [/.Key])
diff --git a/stdlib/source/test/lux/world/net/http/client.lux b/stdlib/source/test/lux/world/net/http/client.lux
index bdfad7989..d1726c7e0 100644
--- a/stdlib/source/test/lux/world/net/http/client.lux
+++ b/stdlib/source/test/lux/world/net/http/client.lux
@@ -27,7 +27,7 @@
     ["/#" //
      ["#." status]]]])
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (_.for [/.Client])
diff --git a/stdlib/source/test/lux/world/net/http/status.lux b/stdlib/source/test/lux/world/net/http/status.lux
index 09f8fa86a..574ce8513 100644
--- a/stdlib/source/test/lux/world/net/http/status.lux
+++ b/stdlib/source/test/lux/world/net/http/status.lux
@@ -108,7 +108,7 @@
     
     <categories>)
 
-  (def: #export test
+  (def: .public test
     Test
     (<| (_.covering /._)
         (`` ($_ _.and
diff --git a/stdlib/source/test/lux/world/output/video/resolution.lux b/stdlib/source/test/lux/world/output/video/resolution.lux
index 378352c57..0775b263e 100644
--- a/stdlib/source/test/lux/world/output/video/resolution.lux
+++ b/stdlib/source/test/lux/world/output/video/resolution.lux
@@ -42,14 +42,14 @@
     (Set /.Resolution)
     (set.of_list /.hash ..listing))
 
-  (def: #export random
+  (def: .public random
     (Random /.Resolution)
     (let [count (list.size ..listing)]
       (do {! random.monad}
         [choice (\ ! map (n.% count) random.nat)]
         (in (maybe.assume (list.item choice ..listing))))))
 
-  (def: #export test
+  (def: .public test
     Test
     (<| (_.covering /._)
         (_.for [/.Resolution])
diff --git a/stdlib/source/test/lux/world/program.lux b/stdlib/source/test/lux/world/program.lux
index 9940220ac..50e1b4ffd 100644
--- a/stdlib/source/test/lux/world/program.lux
+++ b/stdlib/source/test/lux/world/program.lux
@@ -38,7 +38,7 @@
   (Random Path)
   (random.ascii/alpha 5))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       (do {! random.monad}
diff --git a/stdlib/source/test/lux/world/shell.lux b/stdlib/source/test/lux/world/shell.lux
index 0d67c79a0..3db61b469 100644
--- a/stdlib/source/test/lux/world/shell.lux
+++ b/stdlib/source/test/lux/world/shell.lux
@@ -80,7 +80,7 @@
           (def: (await _)
             (io.io (#try.Success exit))))))))
 
-(def: #export test
+(def: .public test
   Test
   (<| (_.covering /._)
       ($_ _.and
-- 
cgit v1.2.3