10 files changed, 15 insertions, 20 deletions
diff --git a/stdlib/test/test/lux/language/compiler/analysis/case.lux b/stdlib/test/test/lux/language/compiler/analysis/case.lux
index 183ae7da7..5956cc48e 100644
--- a/stdlib/test/test/lux/language/compiler/analysis/case.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/case.lux
@@ -12,11 +12,11 @@
      ["." set]]]
    [math
     ["r" random ("random/." Monad<Random>)]]
+   ["." type
+    ["." check]]
    [macro
     ["." code]]
    [language
-    ["." type
-     ["." check]]
     ["." compiler
      ["." analysis
       ["." module]
diff --git a/stdlib/test/test/lux/language/compiler/analysis/function.lux b/stdlib/test/test/lux/language/compiler/analysis/function.lux
index 559a4a841..22ff04213 100644
--- a/stdlib/test/test/lux/language/compiler/analysis/function.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/function.lux
@@ -13,10 +13,10 @@
      ["." list ("list/." Functor<List>)]]]
    [math
     ["r" random]]
+   ["." type]
    ["." macro
     ["." code]]
    ["." language
-    ["." type]
     ["." reference]
     ["." compiler
      ["." init]
diff --git a/stdlib/test/test/lux/language/compiler/analysis/primitive.lux b/stdlib/test/test/lux/language/compiler/analysis/primitive.lux
index e49284c1a..adad90f18 100644
--- a/stdlib/test/test/lux/language/compiler/analysis/primitive.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/primitive.lux
@@ -10,10 +10,10 @@
      format]]
    [math
     ["r" random ("random/." Monad<Random>)]]
+   [".L" type ("type/." Equivalence<Type>)]
    [macro
     ["." code]]
    ["." language
-    [".L" type ("type/." Equivalence<Type>)]
     ["." compiler
      ["." init]
      ["." analysis (#+ Analysis Operation)
diff --git a/stdlib/test/test/lux/language/compiler/analysis/procedure/common.lux b/stdlib/test/test/lux/language/compiler/analysis/procedure/common.lux
index 92afb7083..2a5cc2ee3 100644
--- a/stdlib/test/test/lux/language/compiler/analysis/procedure/common.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/procedure/common.lux
@@ -13,10 +13,10 @@
      format]]
    [math
     ["r" random]]
+   [type ("type/." Equivalence<Type>)]
    [macro
     ["." code]]
    [language
-    [type ("type/." Equivalence<Type>)]
     ["." compiler
      ["." init]
      [analysis
diff --git a/stdlib/test/test/lux/language/compiler/analysis/reference.lux b/stdlib/test/test/lux/language/compiler/analysis/reference.lux
index ac302db3e..66c990ef4 100644
--- a/stdlib/test/test/lux/language/compiler/analysis/reference.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/reference.lux
@@ -9,11 +9,10 @@
     [text ("text/." Equivalence<Text>)]]
    [math
     ["r" random]]
+   [type ("type/." Equivalence<Type>)]
    [macro
     ["." code]]
-   ["." language]
-   [language
-    [type ("type/." Equivalence<Type>)]
+   ["." language
     ["." reference]
     ["." compiler
      ["." init]
diff --git a/stdlib/test/test/lux/language/compiler/analysis/structure.lux b/stdlib/test/test/lux/language/compiler/analysis/structure.lux
index c3c5a0dc2..6dca4fb12 100644
--- a/stdlib/test/test/lux/language/compiler/analysis/structure.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/structure.lux
@@ -14,11 +14,11 @@
      ["." set]]]
    [math
     ["r" random]]
+   ["." type ("type/." Equivalence<Type>)
+    ["." check]]
    [macro
     ["." code]]
    ["." language
-    ["." type ("type/." Equivalence<Type>)
-     ["." check]]
     ["." compiler
      ["." init]
      ["." analysis (#+ Analysis Variant Tag Operation)
diff --git a/stdlib/test/test/lux/math/modular.lux b/stdlib/test/test/lux/math/modular.lux
index cd1f637e9..ad9fda295 100644
--- a/stdlib/test/test/lux/math/modular.lux
+++ b/stdlib/test/test/lux/math/modular.lux
@@ -11,8 +11,7 @@
    [math
     ["r" random]
     ["/" modular]]
-   [language
-    [type ("type/." Equivalence<Type>)]]]
+   [type ("type/." Equivalence<Type>)]]
   lux/test)
 
 (def: %3 (/.modulus 3))
diff --git a/stdlib/test/test/lux/language/type.lux b/stdlib/test/test/lux/type.lux
index 8db1c5a19..9592170ff 100644
--- a/stdlib/test/test/lux/language/type.lux
+++ b/stdlib/test/test/lux/type.lux
@@ -11,8 +11,7 @@
      ["." list]]]
    [math
     ["r" random]]
-   [language
-    ["&" type]]]
+   ["&" type]]
   lux/test)
 
 ## [Utils]
diff --git a/stdlib/test/test/lux/language/type/check.lux b/stdlib/test/test/lux/type/check.lux
index a8cf1963f..c817ec61e 100644
--- a/stdlib/test/test/lux/language/type/check.lux
+++ b/stdlib/test/test/lux/type/check.lux
@@ -13,9 +13,8 @@
      ["." set]]]
    [math
     ["r" random]]
-   [language
-    ["." type ("type/." Equivalence<Type>)
-     ["@" check]]]]
+   ["." type ("type/." Equivalence<Type>)
+    ["@" check]]]
   lux/test)
 
 ## [Utils]
diff --git a/stdlib/test/tests.lux b/stdlib/test/tests.lux
index a795556eb..bdd8ef0ab 100644
--- a/stdlib/test/tests.lux
+++ b/stdlib/test/tests.lux
@@ -143,7 +143,8 @@
      [poly
       ["poly_." equivalence]
       ["poly_." functor]]]
-    [type
+    ["_." type
+     ["_." check]
      ## ["_." implicit] ## TODO: Specially troublesome...
      ["_." resource]
      [object
@@ -151,8 +152,6 @@
       ["_." protocol]]]
     [language
      ["_language/." syntax]
-     ["_." type
-      ["_." check]]
      [compiler
       [analysis
        ["_.A" primitive]