Merge pull request #142 from Nadrieril/upstream-tests

Upstream local tests

150 files changed, 3 insertions, 210 deletions

diff --git a/dhall-lang b/dhall-lang
-Subproject 527f391fc8e48b3c8847b6982b76ac959808c0d
+Subproject ea3ed688dfbd787c7dc998ab00fce7dca78fc4a
diff --git a/dhall/build.rs b/dhall/build.rs
index 3d062da..6a0a3bf 100644
--- a/dhall/build.rs
+++ b/dhall/build.rs
@@ -253,8 +253,6 @@ fn generate_tests() -> std::io::Result<()> {
                     || path == "alternativeHashMismatch"
                     || path == "hashFromCache"
                     || path == "unit/AlternativeHashMismatch"
-                    // TODO: This test is wrong
-                    || path == "asLocation"
                     // TODO: the standard does not respect https://tools.ietf.org/html/rfc3986#section-5.2
                     || path == "unit/asLocation/RemoteCanonicalize4"
                     // TODO: import headers
@@ -287,15 +285,15 @@ fn generate_tests() -> std::io::Result<()> {
             too_slow_path: Box::new(|path: &str| path == "remoteSystems"),
             exclude_path: Box::new(|path: &str| {
                 false
+                    // Cannot typecheck
+                    || path == "unit/Sort"
                     // We don't support bignums
                     || path == "simple/integerToDouble"
                     // TODO: fix Double/show
                     || path == "prelude/JSON/number/1"
-                    // TODO: doesn't typecheck
-                    || path == "unit/RightBiasedRecordMergeWithinRecordProjection"
-                    || path == "unit/Sort"
                     // TODO: Further record simplifications
                     || path == "simplifications/issue661"
+                    || path == "unit/RightBiasedRecordMergeWithinRecordProjection"
             }),
             input_type: FileType::Text,
             output_type: Some(FileType::Text),
diff --git a/dhall/tests/import/data/cycle.dhall b/dhall/tests/import/data/cycle.dhall
deleted file mode 100644
index c370a8d..0000000
--- a/dhall/tests/import/data/cycle.dhall
+++ /dev/null
@@ -1 +0,0 @@
-../failure/cycle.dhall
diff --git a/dhall/tests/import/data/doesNotTypecheck.dhall b/dhall/tests/import/data/doesNotTypecheck.dhall
deleted file mode 100644
index b748e2d..0000000
--- a/dhall/tests/import/data/doesNotTypecheck.dhall
+++ /dev/null
@@ -1 +0,0 @@
-0 0
diff --git a/dhall/tests/import/data/example.txt b/dhall/tests/import/data/example.txt
deleted file mode 100644
index af5626b..0000000
--- a/dhall/tests/import/data/example.txt
+++ /dev/null
@@ -1 +0,0 @@
-Hello, world!
diff --git a/dhall/tests/import/data/fieldOrder/1.dhall b/dhall/tests/import/data/fieldOrder/1.dhall
deleted file mode 100644
index 797e071..0000000
--- a/dhall/tests/import/data/fieldOrder/1.dhall
+++ /dev/null
@@ -1 +0,0 @@
-{ foo = 1, bar = True }
diff --git a/dhall/tests/import/data/fieldOrder/2.dhall b/dhall/tests/import/data/fieldOrder/2.dhall
deleted file mode 100644
index c16b568..0000000
--- a/dhall/tests/import/data/fieldOrder/2.dhall
+++ /dev/null
@@ -1 +0,0 @@
-{ bar = True, foo = 1 }
diff --git a/dhall/tests/import/data/importBoundary.dhall b/dhall/tests/import/data/importBoundary.dhall
deleted file mode 100644
index e6f1074..0000000
--- a/dhall/tests/import/data/importBoundary.dhall
+++ /dev/null
@@ -1,3 +0,0 @@
--- This file contains a free variable. This should be a type error, even if the variable
--- is in scope in the importing expression
-x
diff --git a/dhall/tests/import/data/nested.dhall b/dhall/tests/import/data/nested.dhall
deleted file mode 100644
index bf88f65..0000000
--- a/dhall/tests/import/data/nested.dhall
+++ /dev/null
@@ -1 +0,0 @@
-{ x = ./simple.dhall sha256:15f52ecf91c94c1baac02d5a4964b2ed8fa401641a2c8a95e8306ec7c1e3b8d2 }
diff --git a/dhall/tests/import/data/referentiallyOpaque.dhall b/dhall/tests/import/data/referentiallyOpaque.dhall
deleted file mode 100644
index ff33765..0000000
--- a/dhall/tests/import/data/referentiallyOpaque.dhall
+++ /dev/null
@@ -1,18 +0,0 @@
-{- This is a "referentially opaque" import (i.e. an import that is not
-   globally addressable), which cannot be imported by a "referentially
-   transparent" import (i.e. an import that is globally addressable).
-
-   This test file is used in a failing test to verify that referentially
-   transparent imports cannot import referentially opaque imports.  In the test
-   suite this file is actually imported via its GitHub URL (not its local file
-   path), so it plays the role of the referentially transparent import.  Then,
-   this file attempts to import a referentially opaque import (an environment
-   variable in this case) to verify that the import fails.
-
-   For this test file we need to select a referentially opaque import that
-   would succeed if imported on its own, so that a non-compliant implementation
-   doesn't fail this test for the wrong reason (i.e. due to the import not
-   being present).  We thus use the `DHALL_TEST_VAR` environment variable, that
-   is expected to be set when running import tests.
--}
-env:DHALL_TEST_VAR as Text
diff --git a/dhall/tests/import/data/simple.dhall b/dhall/tests/import/data/simple.dhall
deleted file mode 100644
index 00750ed..0000000
--- a/dhall/tests/import/data/simple.dhall
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/dhall/tests/import/data/simpleLocation.dhall b/dhall/tests/import/data/simpleLocation.dhall
deleted file mode 100644
index 1d3e43b..0000000
--- a/dhall/tests/import/data/simpleLocation.dhall
+++ /dev/null
@@ -1 +0,0 @@
-./simple.dhall as Location
diff --git a/dhall/tests/import/failure/unit/EnvUnset.dhall b/dhall/tests/import/failure/unit/EnvUnset.dhall
deleted file mode 100644
index af77cce..0000000
--- a/dhall/tests/import/failure/unit/EnvUnset.dhall
+++ /dev/null
@@ -1 +0,0 @@
-env:DHALL_TEST_UNSET
diff --git a/dhall/tests/import/failure/unit/EnvUnsetAsText.dhall b/dhall/tests/import/failure/unit/EnvUnsetAsText.dhall
deleted file mode 100644
index 9a9db6d..0000000
--- a/dhall/tests/import/failure/unit/EnvUnsetAsText.dhall
+++ /dev/null
@@ -1 +0,0 @@
-env:DHALL_TEST_UNSET as Text
diff --git a/dhall/tests/import/success/unit/AlternativeChain1A.dhall b/dhall/tests/import/success/unit/AlternativeChain1A.dhall
deleted file mode 100644
index 15fbf4b..0000000
--- a/dhall/tests/import/success/unit/AlternativeChain1A.dhall
+++ /dev/null
@@ -1 +0,0 @@
-missing ? missing ? 42
diff --git a/dhall/tests/import/success/unit/AlternativeChain1B.dhall b/dhall/tests/import/success/unit/AlternativeChain1B.dhall
deleted file mode 100644
index d81cc07..0000000
--- a/dhall/tests/import/success/unit/AlternativeChain1B.dhall
+++ /dev/null
@@ -1 +0,0 @@
-42
diff --git a/dhall/tests/import/success/unit/AlternativeChain2A.dhall b/dhall/tests/import/success/unit/AlternativeChain2A.dhall
deleted file mode 100644
index f3ba4b5..0000000
--- a/dhall/tests/import/success/unit/AlternativeChain2A.dhall
+++ /dev/null
@@ -1 +0,0 @@
-missing ? 42 ? 10
diff --git a/dhall/tests/import/success/unit/AlternativeChain2B.dhall b/dhall/tests/import/success/unit/AlternativeChain2B.dhall
deleted file mode 100644
index d81cc07..0000000
--- a/dhall/tests/import/success/unit/AlternativeChain2B.dhall
+++ /dev/null
@@ -1 +0,0 @@
-42
diff --git a/dhall/tests/import/success/unit/AlternativeEnvA.dhall b/dhall/tests/import/success/unit/AlternativeEnvA.dhall
deleted file mode 100644
index 1807534..0000000
--- a/dhall/tests/import/success/unit/AlternativeEnvA.dhall
+++ /dev/null
@@ -1 +0,0 @@
-env:DHALL_TEST_UNSET ? 42
diff --git a/dhall/tests/import/success/unit/AlternativeEnvB.dhall b/dhall/tests/import/success/unit/AlternativeEnvB.dhall
deleted file mode 100644
index d81cc07..0000000
--- a/dhall/tests/import/success/unit/AlternativeEnvB.dhall
+++ /dev/null
@@ -1 +0,0 @@
-42
diff --git a/dhall/tests/import/success/unit/AlternativeHashMismatchA.dhall b/dhall/tests/import/success/unit/AlternativeHashMismatchA.dhall
deleted file mode 100644
index 8f7fb02..0000000
--- a/dhall/tests/import/success/unit/AlternativeHashMismatchA.dhall
+++ /dev/null
@@ -1 +0,0 @@
-../../data/simple.dhall sha256:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa ? 42
diff --git a/dhall/tests/import/success/unit/AlternativeHashMismatchB.dhall b/dhall/tests/import/success/unit/AlternativeHashMismatchB.dhall
deleted file mode 100644
index d81cc07..0000000
--- a/dhall/tests/import/success/unit/AlternativeHashMismatchB.dhall
+++ /dev/null
@@ -1 +0,0 @@
-42
diff --git a/dhall/tests/import/success/unit/AlternativeImportErrorA.dhall b/dhall/tests/import/success/unit/AlternativeImportErrorA.dhall
deleted file mode 100644
index 9ecc640..0000000
--- a/dhall/tests/import/success/unit/AlternativeImportErrorA.dhall
+++ /dev/null
@@ -1 +0,0 @@
-missing ? 42
diff --git a/dhall/tests/import/success/unit/AlternativeImportErrorB.dhall b/dhall/tests/import/success/unit/AlternativeImportErrorB.dhall
deleted file mode 100644
index d81cc07..0000000
--- a/dhall/tests/import/success/unit/AlternativeImportErrorB.dhall
+++ /dev/null
@@ -1 +0,0 @@
-42
diff --git a/dhall/tests/import/success/unit/AlternativeNestedImportErrorA.dhall b/dhall/tests/import/success/unit/AlternativeNestedImportErrorA.dhall
deleted file mode 100644
index d681287..0000000
--- a/dhall/tests/import/success/unit/AlternativeNestedImportErrorA.dhall
+++ /dev/null
@@ -1 +0,0 @@
-../../failure/missing.dhall ? 42
diff --git a/dhall/tests/import/success/unit/AlternativeNestedImportErrorB.dhall b/dhall/tests/import/success/unit/AlternativeNestedImportErrorB.dhall
deleted file mode 100644
index d81cc07..0000000
--- a/dhall/tests/import/success/unit/AlternativeNestedImportErrorB.dhall
+++ /dev/null
@@ -1 +0,0 @@
-42
diff --git a/dhall/tests/import/success/unit/AlternativeNoError1A.dhall b/dhall/tests/import/success/unit/AlternativeNoError1A.dhall
deleted file mode 100644
index f7c9caf..0000000
--- a/dhall/tests/import/success/unit/AlternativeNoError1A.dhall
+++ /dev/null
@@ -1 +0,0 @@
-42 ? 10
diff --git a/dhall/tests/import/success/unit/AlternativeNoError1B.dhall b/dhall/tests/import/success/unit/AlternativeNoError1B.dhall
deleted file mode 100644
index d81cc07..0000000
--- a/dhall/tests/import/success/unit/AlternativeNoError1B.dhall
+++ /dev/null
@@ -1 +0,0 @@
-42
diff --git a/dhall/tests/import/success/unit/AlternativeNoError2A.dhall b/dhall/tests/import/success/unit/AlternativeNoError2A.dhall
deleted file mode 100644
index 877afd2..0000000
--- a/dhall/tests/import/success/unit/AlternativeNoError2A.dhall
+++ /dev/null
@@ -1 +0,0 @@
-42 ? missing
diff --git a/dhall/tests/import/success/unit/AlternativeNoError2B.dhall b/dhall/tests/import/success/unit/AlternativeNoError2B.dhall
deleted file mode 100644
index d81cc07..0000000
--- a/dhall/tests/import/success/unit/AlternativeNoError2B.dhall
+++ /dev/null
@@ -1 +0,0 @@
-42
diff --git a/dhall/tests/import/success/unit/AlternativeNoError3A.dhall b/dhall/tests/import/success/unit/AlternativeNoError3A.dhall
deleted file mode 100644
index 91bcda2..0000000
--- a/dhall/tests/import/success/unit/AlternativeNoError3A.dhall
+++ /dev/null
@@ -1 +0,0 @@
-env:DHALL_TEST_VAR ? 10
diff --git a/dhall/tests/import/success/unit/AlternativeNoError3B.dhall b/dhall/tests/import/success/unit/AlternativeNoError3B.dhall
deleted file mode 100644
index d81cc07..0000000
--- a/dhall/tests/import/success/unit/AlternativeNoError3B.dhall
+++ /dev/null
@@ -1 +0,0 @@
-42
diff --git a/dhall/tests/import/success/unit/AlternativeParseErrorA.dhall b/dhall/tests/import/success/unit/AlternativeParseErrorA.dhall
deleted file mode 100644
index d427c5d..0000000
--- a/dhall/tests/import/success/unit/AlternativeParseErrorA.dhall
+++ /dev/null
@@ -1 +0,0 @@
-../../data/example.txt ? 42
diff --git a/dhall/tests/import/success/unit/AlternativeParseErrorB.dhall b/dhall/tests/import/success/unit/AlternativeParseErrorB.dhall
deleted file mode 100644
index d81cc07..0000000
--- a/dhall/tests/import/success/unit/AlternativeParseErrorB.dhall
+++ /dev/null
@@ -1 +0,0 @@
-42
diff --git a/dhall/tests/import/success/unit/AlternativeSubExprA.dhall b/dhall/tests/import/success/unit/AlternativeSubExprA.dhall
deleted file mode 100644
index 2c13f4b..0000000
--- a/dhall/tests/import/success/unit/AlternativeSubExprA.dhall
+++ /dev/null
@@ -1 +0,0 @@
-missing + 10 ? 42
diff --git a/dhall/tests/import/success/unit/AlternativeSubExprB.dhall b/dhall/tests/import/success/unit/AlternativeSubExprB.dhall
deleted file mode 100644
index d81cc07..0000000
--- a/dhall/tests/import/success/unit/AlternativeSubExprB.dhall
+++ /dev/null
@@ -1 +0,0 @@
-42
diff --git a/dhall/tests/import/success/unit/AlternativeTypeErrorA.dhall b/dhall/tests/import/success/unit/AlternativeTypeErrorA.dhall
deleted file mode 100644
index 24ae717..0000000
--- a/dhall/tests/import/success/unit/AlternativeTypeErrorA.dhall
+++ /dev/null
@@ -1 +0,0 @@
-../../data/doesNotTypecheck.dhall ? 42
diff --git a/dhall/tests/import/success/unit/AlternativeTypeErrorB.dhall b/dhall/tests/import/success/unit/AlternativeTypeErrorB.dhall
deleted file mode 100644
index d81cc07..0000000
--- a/dhall/tests/import/success/unit/AlternativeTypeErrorB.dhall
+++ /dev/null
@@ -1 +0,0 @@
-42
diff --git a/dhall/tests/import/success/unit/AsTextA.dhall b/dhall/tests/import/success/unit/AsTextA.dhall
deleted file mode 100644
index 9edb0ed..0000000
--- a/dhall/tests/import/success/unit/AsTextA.dhall
+++ /dev/null
@@ -1 +0,0 @@
-../../data/example.txt as Text
diff --git a/dhall/tests/import/success/unit/AsTextB.dhall b/dhall/tests/import/success/unit/AsTextB.dhall
deleted file mode 100644
index 1997a89..0000000
--- a/dhall/tests/import/success/unit/AsTextB.dhall
+++ /dev/null
@@ -1,3 +0,0 @@
-''
-Hello, world!
-''
diff --git a/dhall/tests/import/success/unit/EnvSetA.dhall b/dhall/tests/import/success/unit/EnvSetA.dhall
deleted file mode 100644
index f851f2a..0000000
--- a/dhall/tests/import/success/unit/EnvSetA.dhall
+++ /dev/null
@@ -1 +0,0 @@
-env:DHALL_TEST_VAR
diff --git a/dhall/tests/import/success/unit/EnvSetAsTextA.dhall b/dhall/tests/import/success/unit/EnvSetAsTextA.dhall
deleted file mode 100644
index 139b241..0000000
--- a/dhall/tests/import/success/unit/EnvSetAsTextA.dhall
+++ /dev/null
@@ -1 +0,0 @@
-env:DHALL_TEST_VAR as Text
diff --git a/dhall/tests/import/success/unit/EnvSetAsTextB.dhall b/dhall/tests/import/success/unit/EnvSetAsTextB.dhall
deleted file mode 100644
index a79bb82..0000000
--- a/dhall/tests/import/success/unit/EnvSetAsTextB.dhall
+++ /dev/null
@@ -1 +0,0 @@
-"6 * 7"
diff --git a/dhall/tests/import/success/unit/EnvSetB.dhall b/dhall/tests/import/success/unit/EnvSetB.dhall
deleted file mode 100644
index d81cc07..0000000
--- a/dhall/tests/import/success/unit/EnvSetB.dhall
+++ /dev/null
@@ -1 +0,0 @@
-42
diff --git a/dhall/tests/import/success/unit/NormalizeA.dhall b/dhall/tests/import/success/unit/NormalizeA.dhall
deleted file mode 100644
index 2f89d08..0000000
--- a/dhall/tests/import/success/unit/NormalizeA.dhall
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../dhall-lang/tests/normalization/success/unit/OperatorPlusOneAndOneA.dhall
diff --git a/dhall/tests/import/success/unit/NormalizeB.dhall b/dhall/tests/import/success/unit/NormalizeB.dhall
deleted file mode 100644
index 0cfbf08..0000000
--- a/dhall/tests/import/success/unit/NormalizeB.dhall
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/dhall/tests/import/success/unit/RemoteAsTextA.dhall b/dhall/tests/import/success/unit/RemoteAsTextA.dhall
deleted file mode 100644
index 472d041..0000000
--- a/dhall/tests/import/success/unit/RemoteAsTextA.dhall
+++ /dev/null
@@ -1 +0,0 @@
-https://raw.githubusercontent.com/dhall-lang/dhall-lang/0b983b92aa2222dc3e292c20550ee37dea3f41df/tests/import/data/example.txt as Text
diff --git a/dhall/tests/import/success/unit/RemoteAsTextB.dhall b/dhall/tests/import/success/unit/RemoteAsTextB.dhall
deleted file mode 100644
index 1997a89..0000000
--- a/dhall/tests/import/success/unit/RemoteAsTextB.dhall
+++ /dev/null
@@ -1,3 +0,0 @@
-''
-Hello, world!
-''
diff --git a/dhall/tests/import/success/unit/SimpleA.dhall b/dhall/tests/import/success/unit/SimpleA.dhall
deleted file mode 100644
index 035ee8b..0000000
--- a/dhall/tests/import/success/unit/SimpleA.dhall
+++ /dev/null
@@ -1 +0,0 @@
-../../data/simple.dhall
diff --git a/dhall/tests/import/success/unit/SimpleB.dhall b/dhall/tests/import/success/unit/SimpleB.dhall
deleted file mode 100644
index 00750ed..0000000
--- a/dhall/tests/import/success/unit/SimpleB.dhall
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/dhall/tests/import/success/unit/SimpleRemoteA.dhall b/dhall/tests/import/success/unit/SimpleRemoteA.dhall
deleted file mode 100644
index 30e0a79..0000000
--- a/dhall/tests/import/success/unit/SimpleRemoteA.dhall
+++ /dev/null
@@ -1 +0,0 @@
-https://raw.githubusercontent.com/dhall-lang/dhall-lang/0b983b92aa2222dc3e292c20550ee37dea3f41df/tests/import/data/simple.dhall
diff --git a/dhall/tests/import/success/unit/SimpleRemoteB.dhall b/dhall/tests/import/success/unit/SimpleRemoteB.dhall
deleted file mode 100644
index 00750ed..0000000
--- a/dhall/tests/import/success/unit/SimpleRemoteB.dhall
+++ /dev/null
@@ -1 +0,0 @@
-3
diff --git a/dhall/tests/import/success/unit/asLocation/AbsoluteA.dhall b/dhall/tests/import/success/unit/asLocation/AbsoluteA.dhall
deleted file mode 100644
index dcf45d1..0000000
--- a/dhall/tests/import/success/unit/asLocation/AbsoluteA.dhall
+++ /dev/null
@@ -1 +0,0 @@
-/absolute/import as Location
diff --git a/dhall/tests/import/success/unit/asLocation/AbsoluteB.dhall b/dhall/tests/import/success/unit/asLocation/AbsoluteB.dhall
deleted file mode 100644
index 1c1add7..0000000
--- a/dhall/tests/import/success/unit/asLocation/AbsoluteB.dhall
+++ /dev/null
@@ -1,2 +0,0 @@
-< Environment : Text | Remote : Text | Local : Text | Missing >.Local
-  "/absolute/import"
diff --git a/dhall/tests/import/success/unit/asLocation/Canonicalize1A.dhall b/dhall/tests/import/success/unit/asLocation/Canonicalize1A.dhall
deleted file mode 100644
index e636ed1..0000000
--- a/dhall/tests/import/success/unit/asLocation/Canonicalize1A.dhall
+++ /dev/null
@@ -1 +0,0 @@
-./foo/./bar/import.dhall as Location
diff --git a/dhall/tests/import/success/unit/asLocation/Canonicalize1B.dhall b/dhall/tests/import/success/unit/asLocation/Canonicalize1B.dhall
deleted file mode 100644
index 3a8a926..0000000
--- a/dhall/tests/import/success/unit/asLocation/Canonicalize1B.dhall
+++ /dev/null
@@ -1,2 +0,0 @@
-< Environment : Text | Remote : Text | Local : Text | Missing >.Local
-  "./dhall/tests/import/success/unit/asLocation/foo/bar/import.dhall"
diff --git a/dhall/tests/import/success/unit/asLocation/Canonicalize2A.dhall b/dhall/tests/import/success/unit/asLocation/Canonicalize2A.dhall
deleted file mode 100644
index c6ef89f..0000000
--- a/dhall/tests/import/success/unit/asLocation/Canonicalize2A.dhall
+++ /dev/null
@@ -1 +0,0 @@
-./foo/baz/../bar/import.dhall as Location
diff --git a/dhall/tests/import/success/unit/asLocation/Canonicalize2B.dhall b/dhall/tests/import/success/unit/asLocation/Canonicalize2B.dhall
deleted file mode 100644
index 3a8a926..0000000
--- a/dhall/tests/import/success/unit/asLocation/Canonicalize2B.dhall
+++ /dev/null
@@ -1,2 +0,0 @@
-< Environment : Text | Remote : Text | Local : Text | Missing >.Local
-  "./dhall/tests/import/success/unit/asLocation/foo/bar/import.dhall"
diff --git a/dhall/tests/import/success/unit/asLocation/Canonicalize3A.dhall b/dhall/tests/import/success/unit/asLocation/Canonicalize3A.dhall
deleted file mode 100644
index e6be780..0000000
--- a/dhall/tests/import/success/unit/asLocation/Canonicalize3A.dhall
+++ /dev/null
@@ -1 +0,0 @@
-./../bar/import.dhall as Location
diff --git a/dhall/tests/import/success/unit/asLocation/Canonicalize3B.dhall b/dhall/tests/import/success/unit/asLocation/Canonicalize3B.dhall
deleted file mode 100644
index b223da6..0000000
--- a/dhall/tests/import/success/unit/asLocation/Canonicalize3B.dhall
+++ /dev/null
@@ -1,2 +0,0 @@
-< Environment : Text | Remote : Text | Local : Text | Missing >.Local
-  "./dhall/tests/import/success/unit/bar/import.dhall"
diff --git a/dhall/tests/import/success/unit/asLocation/Canonicalize4A.dhall b/dhall/tests/import/success/unit/asLocation/Canonicalize4A.dhall
deleted file mode 100644
index ffccd47..0000000
--- a/dhall/tests/import/success/unit/asLocation/Canonicalize4A.dhall
+++ /dev/null
@@ -1 +0,0 @@
-../../bar/import.dhall as Location
diff --git a/dhall/tests/import/success/unit/asLocation/Canonicalize4B.dhall b/dhall/tests/import/success/unit/asLocation/Canonicalize4B.dhall
deleted file mode 100644
index b6301f8..0000000
--- a/dhall/tests/import/success/unit/asLocation/Canonicalize4B.dhall
+++ /dev/null
@@ -1,2 +0,0 @@
-< Environment : Text | Remote : Text | Local : Text | Missing >.Local
-  "./dhall/tests/import/success/bar/import.dhall"
diff --git a/dhall/tests/import/success/unit/asLocation/Canonicalize5A.dhall b/dhall/tests/import/success/unit/asLocation/Canonicalize5A.dhall
deleted file mode 100644
index 7e58f0b..0000000
--- a/dhall/tests/import/success/unit/asLocation/Canonicalize5A.dhall
+++ /dev/null
@@ -1 +0,0 @@
-./foo/../../bar/import.dhall as Location
diff --git a/dhall/tests/import/success/unit/asLocation/Canonicalize5B.dhall b/dhall/tests/import/success/unit/asLocation/Canonicalize5B.dhall
deleted file mode 100644
index b223da6..0000000
--- a/dhall/tests/import/success/unit/asLocation/Canonicalize5B.dhall
+++ /dev/null
@@ -1,2 +0,0 @@
-< Environment : Text | Remote : Text | Local : Text | Missing >.Local
-  "./dhall/tests/import/success/unit/bar/import.dhall"
diff --git a/dhall/tests/import/success/unit/asLocation/Chain1A.dhall b/dhall/tests/import/success/unit/asLocation/Chain1A.dhall
deleted file mode 100644
index cf633fe..0000000
--- a/dhall/tests/import/success/unit/asLocation/Chain1A.dhall
+++ /dev/null
@@ -1 +0,0 @@
-./Relative1A.dhall
diff --git a/dhall/tests/import/success/unit/asLocation/Chain1B.dhall b/dhall/tests/import/success/unit/asLocation/Chain1B.dhall
deleted file mode 100644
index 6aee0b5..0000000
--- a/dhall/tests/import/success/unit/asLocation/Chain1B.dhall
+++ /dev/null
@@ -1,2 +0,0 @@
-< Environment : Text | Local : Text | Missing | Remote : Text >.Local
-  "./dhall/tests/import/success/unit/asLocation/some/import.dhall"
diff --git a/dhall/tests/import/success/unit/asLocation/Chain2A.dhall b/dhall/tests/import/success/unit/asLocation/Chain2A.dhall
deleted file mode 100644
index cdbd10d..0000000
--- a/dhall/tests/import/success/unit/asLocation/Chain2A.dhall
+++ /dev/null
@@ -1 +0,0 @@
-./Canonicalize4A.dhall
diff --git a/dhall/tests/import/success/unit/asLocation/Chain2B.dhall b/dhall/tests/import/success/unit/asLocation/Chain2B.dhall
deleted file mode 100644
index 6aba54e..0000000
--- a/dhall/tests/import/success/unit/asLocation/Chain2B.dhall
+++ /dev/null
@@ -1,2 +0,0 @@
-< Environment : Text | Local : Text | Missing | Remote : Text >.Local
-  "./dhall/tests/import/success/bar/import.dhall"
diff --git a/dhall/tests/import/success/unit/asLocation/Chain3A.dhall b/dhall/tests/import/success/unit/asLocation/Chain3A.dhall
deleted file mode 100644
index 57751f6..0000000
--- a/dhall/tests/import/success/unit/asLocation/Chain3A.dhall
+++ /dev/null
@@ -1 +0,0 @@
-../asLocation/Canonicalize4A.dhall
diff --git a/dhall/tests/import/success/unit/asLocation/Chain3B.dhall b/dhall/tests/import/success/unit/asLocation/Chain3B.dhall
deleted file mode 100644
index 6aba54e..0000000
--- a/dhall/tests/import/success/unit/asLocation/Chain3B.dhall
+++ /dev/null
@@ -1,2 +0,0 @@
-< Environment : Text | Local : Text | Missing | Remote : Text >.Local
-  "./dhall/tests/import/success/bar/import.dhall"
diff --git a/dhall/tests/import/success/unit/asLocation/DontTryResolvingA.dhall b/dhall/tests/import/success/unit/asLocation/DontTryResolvingA.dhall
deleted file mode 100644
index e70016c..0000000
--- a/dhall/tests/import/success/unit/asLocation/DontTryResolvingA.dhall
+++ /dev/null
@@ -1 +0,0 @@
-(missing as Location) ? 42  -- `missing` fails as an import, but definitely resolves as Location
diff --git a/dhall/tests/import/success/unit/asLocation/DontTryResolvingB.dhall b/dhall/tests/import/success/unit/asLocation/DontTryResolvingB.dhall
deleted file mode 100644
index dd5e798..0000000
--- a/dhall/tests/import/success/unit/asLocation/DontTryResolvingB.dhall
+++ /dev/null
@@ -1 +0,0 @@
-< Environment : Text | Remote : Text | Local : Text | Missing >.Missing
diff --git a/dhall/tests/import/success/unit/asLocation/EnvA.dhall b/dhall/tests/import/success/unit/asLocation/EnvA.dhall
deleted file mode 100644
index eb4b4a6..0000000
--- a/dhall/tests/import/success/unit/asLocation/EnvA.dhall
+++ /dev/null
@@ -1 +0,0 @@
-env:HOME as Location
diff --git a/dhall/tests/import/success/unit/asLocation/EnvB.dhall b/dhall/tests/import/success/unit/asLocation/EnvB.dhall
deleted file mode 100644
index 4947caa..0000000
--- a/dhall/tests/import/success/unit/asLocation/EnvB.dhall
+++ /dev/null
@@ -1,2 +0,0 @@
-< Environment : Text | Remote : Text | Local : Text | Missing >.Environment
-  "HOME"
diff --git a/dhall/tests/import/success/unit/asLocation/HashA.dhall b/dhall/tests/import/success/unit/asLocation/HashA.dhall
deleted file mode 100644
index 79f4fda..0000000
--- a/dhall/tests/import/success/unit/asLocation/HashA.dhall
+++ /dev/null
@@ -1 +0,0 @@
-./some/import.dhall sha256:f9340badf94a684e652e0a384f64363293d8b632d971f3453f7ee22f10ab6e75 as Location
diff --git a/dhall/tests/import/success/unit/asLocation/HashB.dhall b/dhall/tests/import/success/unit/asLocation/HashB.dhall
deleted file mode 100644
index 6aee0b5..0000000
--- a/dhall/tests/import/success/unit/asLocation/HashB.dhall
+++ /dev/null
@@ -1,2 +0,0 @@
-< Environment : Text | Local : Text | Missing | Remote : Text >.Local
-  "./dhall/tests/import/success/unit/asLocation/some/import.dhall"
diff --git a/dhall/tests/import/success/unit/asLocation/HomeA.dhall b/dhall/tests/import/success/unit/asLocation/HomeA.dhall
deleted file mode 100644
index 18cc2cd..0000000
--- a/dhall/tests/import/success/unit/asLocation/HomeA.dhall
+++ /dev/null
@@ -1 +0,0 @@
-~/some/import.dhall as Location
diff --git a/dhall/tests/import/success/unit/asLocation/HomeB.dhall b/dhall/tests/import/success/unit/asLocation/HomeB.dhall
deleted file mode 100644
index 8b4f0fd..0000000
--- a/dhall/tests/import/success/unit/asLocation/HomeB.dhall
+++ /dev/null
@@ -1,2 +0,0 @@
-< Environment : Text | Remote : Text | Local : Text | Missing >.Local
-  "~/some/import.dhall"
diff --git a/dhall/tests/import/success/unit/asLocation/MissingA.dhall b/dhall/tests/import/success/unit/asLocation/MissingA.dhall
deleted file mode 100644
index e06a30b..0000000
--- a/dhall/tests/import/success/unit/asLocation/MissingA.dhall
+++ /dev/null
@@ -1 +0,0 @@
-missing as Location
diff --git a/dhall/tests/import/success/unit/asLocation/MissingB.dhall b/dhall/tests/import/success/unit/asLocation/MissingB.dhall
deleted file mode 100644
index dd5e798..0000000
--- a/dhall/tests/import/success/unit/asLocation/MissingB.dhall
+++ /dev/null
@@ -1 +0,0 @@
-< Environment : Text | Remote : Text | Local : Text | Missing >.Missing
diff --git a/dhall/tests/import/success/unit/asLocation/Relative1A.dhall b/dhall/tests/import/success/unit/asLocation/Relative1A.dhall
deleted file mode 100644
index b514f79..0000000
--- a/dhall/tests/import/success/unit/asLocation/Relative1A.dhall
+++ /dev/null
@@ -1 +0,0 @@
-./some/import.dhall as Location
diff --git a/dhall/tests/import/success/unit/asLocation/Relative1B.dhall b/dhall/tests/import/success/unit/asLocation/Relative1B.dhall
deleted file mode 100644
index 6aee0b5..0000000
--- a/dhall/tests/import/success/unit/asLocation/Relative1B.dhall
+++ /dev/null
@@ -1,2 +0,0 @@
-< Environment : Text | Local : Text | Missing | Remote : Text >.Local
-  "./dhall/tests/import/success/unit/asLocation/some/import.dhall"
diff --git a/dhall/tests/import/success/unit/asLocation/Relative2A.dhall b/dhall/tests/import/success/unit/asLocation/Relative2A.dhall
deleted file mode 100644
index ec59586..0000000
--- a/dhall/tests/import/success/unit/asLocation/Relative2A.dhall
+++ /dev/null
@@ -1 +0,0 @@
-../some/import.dhall as Location
diff --git a/dhall/tests/import/success/unit/asLocation/Relative2B.dhall b/dhall/tests/import/success/unit/asLocation/Relative2B.dhall
deleted file mode 100644
index 9842f7c..0000000
--- a/dhall/tests/import/success/unit/asLocation/Relative2B.dhall
+++ /dev/null
@@ -1,2 +0,0 @@
-< Environment : Text | Local : Text | Missing | Remote : Text >.Local
-  "./dhall/tests/import/success/unit/some/import.dhall"
diff --git a/dhall/tests/import/success/unit/asLocation/RemoteA.dhall b/dhall/tests/import/success/unit/asLocation/RemoteA.dhall
deleted file mode 100644
index 54ea028..0000000
--- a/dhall/tests/import/success/unit/asLocation/RemoteA.dhall
+++ /dev/null
@@ -1 +0,0 @@
-https://example.com/foo/import.dhall as Location
diff --git a/dhall/tests/import/success/unit/asLocation/RemoteB.dhall b/dhall/tests/import/success/unit/asLocation/RemoteB.dhall
deleted file mode 100644
index e22cfac..0000000
--- a/dhall/tests/import/success/unit/asLocation/RemoteB.dhall
+++ /dev/null
@@ -1,2 +0,0 @@
-< Environment : Text | Local : Text | Missing | Remote : Text >.Remote
-  "https://example.com/foo/import.dhall"
diff --git a/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize1A.dhall b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize1A.dhall
deleted file mode 100644
index 3e6378e..0000000
--- a/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize1A.dhall
+++ /dev/null
@@ -1 +0,0 @@
-https://example.com/foo/./bar/import.dhall as Location
diff --git a/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize1B.dhall b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize1B.dhall
deleted file mode 100644
index 0064a13..0000000
--- a/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize1B.dhall
+++ /dev/null
@@ -1,2 +0,0 @@
-< Environment : Text | Local : Text | Missing | Remote : Text >.Remote
-  "https://example.com/foo/bar/import.dhall"
diff --git a/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize2A.dhall b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize2A.dhall
deleted file mode 100644
index d3fd11e..0000000
--- a/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize2A.dhall
+++ /dev/null
@@ -1 +0,0 @@
-https://example.com/foo/bar/../baz/import.dhall as Location
diff --git a/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize2B.dhall b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize2B.dhall
deleted file mode 100644
index d85236b..0000000
--- a/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize2B.dhall
+++ /dev/null
@@ -1,2 +0,0 @@
-< Environment : Text | Local : Text | Missing | Remote : Text >.Remote
-  "https://example.com/foo/baz/import.dhall"
diff --git a/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize3A.dhall b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize3A.dhall
deleted file mode 100644
index 2074fbf..0000000
--- a/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize3A.dhall
+++ /dev/null
@@ -1 +0,0 @@
-https://example.com/foo/bar/../../baz/import.dhall as Location
diff --git a/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize3B.dhall b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize3B.dhall
deleted file mode 100644
index 45a2857..0000000
--- a/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize3B.dhall
+++ /dev/null
@@ -1,2 +0,0 @@
-< Environment : Text | Local : Text | Missing | Remote : Text >.Remote
-  "https://example.com/baz/import.dhall"
diff --git a/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize4A.dhall b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize4A.dhall
deleted file mode 100644
index 9358f44..0000000
--- a/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize4A.dhall
+++ /dev/null
@@ -1 +0,0 @@
-https://example.com/../bar/import.dhall as Location
diff --git a/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize4B.dhall b/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize4B.dhall
deleted file mode 100644
index b5ccbcd..0000000
--- a/dhall/tests/import/success/unit/asLocation/RemoteCanonicalize4B.dhall
+++ /dev/null
@@ -1,2 +0,0 @@
-< Environment : Text | Local : Text | Missing | Remote : Text >.Remote
-  "https://example.com/../bar/import.dhall"
diff --git a/dhall/tests/import/success/unit/asLocation/RemoteChain1A.dhall b/dhall/tests/import/success/unit/asLocation/RemoteChain1A.dhall
deleted file mode 100644
index 7d081ab..0000000
--- a/dhall/tests/import/success/unit/asLocation/RemoteChain1A.dhall
+++ /dev/null
@@ -1 +0,0 @@
-https://raw.githubusercontent.com/dhall-lang/dhall-lang/0b983b92aa2222dc3e292c20550ee37dea3f41df/tests/import/data/simpleLocation.dhall
diff --git a/dhall/tests/import/success/unit/asLocation/RemoteChain1B.dhall b/dhall/tests/import/success/unit/asLocation/RemoteChain1B.dhall
deleted file mode 100644
index 8ac2c6b..0000000
--- a/dhall/tests/import/success/unit/asLocation/RemoteChain1B.dhall
+++ /dev/null
@@ -1,2 +0,0 @@
-< Environment : Text | Local : Text | Missing | Remote : Text >.Remote
-  "https://raw.githubusercontent.com/dhall-lang/dhall-lang/0b983b92aa2222dc3e292c20550ee37dea3f41df/tests/import/data/simple.dhall"
diff --git a/dhall/tests/import/success/unit/asLocation/RemoteChain2A.dhall b/dhall/tests/import/success/unit/asLocation/RemoteChain2A.dhall
deleted file mode 100644
index 9929517..0000000
--- a/dhall/tests/import/success/unit/asLocation/RemoteChain2A.dhall
+++ /dev/null
@@ -1 +0,0 @@
-https://raw.githubusercontent.com/Nadrieril/dhall-rust/f7d8c64a9799f139ad65427c2518376adb9e2e2f/dhall/tests/import/success/unit/asLocation/Canonicalize3A.dhall
diff --git a/dhall/tests/import/success/unit/asLocation/RemoteChain2B.dhall b/dhall/tests/import/success/unit/asLocation/RemoteChain2B.dhall
deleted file mode 100644
index 685dc04..0000000
--- a/dhall/tests/import/success/unit/asLocation/RemoteChain2B.dhall
+++ /dev/null
@@ -1,2 +0,0 @@
-< Environment : Text | Local : Text | Missing | Remote : Text >.Remote
-  "https://raw.githubusercontent.com/Nadrieril/dhall-rust/f7d8c64a9799f139ad65427c2518376adb9e2e2f/dhall/tests/import/success/unit/bar/import.dhall"
diff --git a/dhall/tests/import/success/unit/asLocation/RemoteChain3A.dhall b/dhall/tests/import/success/unit/asLocation/RemoteChain3A.dhall
deleted file mode 100644
index 851108c..0000000
--- a/dhall/tests/import/success/unit/asLocation/RemoteChain3A.dhall
+++ /dev/null
@@ -1 +0,0 @@
-https://raw.githubusercontent.com/Nadrieril/dhall-rust/f7d8c64a9799f139ad65427c2518376adb9e2e2f/dhall/tests/import/success/unit/asLocation/Canonicalize5A.dhall
diff --git a/dhall/tests/import/success/unit/asLocation/RemoteChain3B.dhall b/dhall/tests/import/success/unit/asLocation/RemoteChain3B.dhall
deleted file mode 100644
index 685dc04..0000000
--- a/dhall/tests/import/success/unit/asLocation/RemoteChain3B.dhall
+++ /dev/null
@@ -1,2 +0,0 @@
-< Environment : Text | Local : Text | Missing | Remote : Text >.Remote
-  "https://raw.githubusercontent.com/Nadrieril/dhall-rust/f7d8c64a9799f139ad65427c2518376adb9e2e2f/dhall/tests/import/success/unit/bar/import.dhall"
diff --git a/dhall/tests/normalization/success/regression/NaturalFoldExtraArgA.dhall b/dhall/tests/normalization/success/regression/NaturalFoldExtraArgA.dhall
deleted file mode 100644
index 3a69d1e..0000000
--- a/dhall/tests/normalization/success/regression/NaturalFoldExtraArgA.dhall
+++ /dev/null
@@ -1 +0,0 @@
-Natural/fold 0 (Bool -> Bool) (λ(_ : (Bool -> Bool)) → λ(_ : Bool) → True) (λ(_ : Bool) → False) True
diff --git a/dhall/tests/normalization/success/regression/NaturalFoldExtraArgB.dhall b/dhall/tests/normalization/success/regression/NaturalFoldExtraArgB.dhall
deleted file mode 100644
index bc59c12..0000000
--- a/dhall/tests/normalization/success/regression/NaturalFoldExtraArgB.dhall
+++ /dev/null
@@ -1 +0,0 @@
-False
diff --git a/dhall/tests/normalization/success/regression/TrickyBinderIdentityA.dhall b/dhall/tests/normalization/success/regression/TrickyBinderIdentityA.dhall
deleted file mode 100644
index 5d72bbe..0000000
--- a/dhall/tests/normalization/success/regression/TrickyBinderIdentityA.dhall
+++ /dev/null
@@ -1 +0,0 @@
-let T = Natural let ap = λ(f : T → List T) -> λ(x : T) -> f x in ap (λ(x : T) -> ap (λ(y : T) -> [x, y]) 1) 0
diff --git a/dhall/tests/normalization/success/regression/TrickyBinderIdentityB.dhall b/dhall/tests/normalization/success/regression/TrickyBinderIdentityB.dhall
deleted file mode 100644
index 28233fb..0000000
--- a/dhall/tests/normalization/success/regression/TrickyBinderIdentityB.dhall
+++ /dev/null
@@ -1 +0,0 @@
-[ 0, 1 ]
diff --git a/dhall/tests/normalization/success/unit/TextLitNested1A.dhall b/dhall/tests/normalization/success/unit/TextLitNested1A.dhall
deleted file mode 100644
index 104dc41..0000000
--- a/dhall/tests/normalization/success/unit/TextLitNested1A.dhall
+++ /dev/null
@@ -1 +0,0 @@
-λ(x: Text) → "${""}${x}"
diff --git a/dhall/tests/normalization/success/unit/TextLitNested1B.dhall b/dhall/tests/normalization/success/unit/TextLitNested1B.dhall
deleted file mode 100644
index 631a6cf..0000000
--- a/dhall/tests/normalization/success/unit/TextLitNested1B.dhall
+++ /dev/null
@@ -1 +0,0 @@
-λ(x : Text) → x
diff --git a/dhall/tests/normalization/success/unit/TextLitNested2A.dhall b/dhall/tests/normalization/success/unit/TextLitNested2A.dhall
deleted file mode 100644
index 5b4ae6e..0000000
--- a/dhall/tests/normalization/success/unit/TextLitNested2A.dhall
+++ /dev/null
@@ -1 +0,0 @@
-λ(x: Text) → "${"${x}"}"
diff --git a/dhall/tests/normalization/success/unit/TextLitNested2B.dhall b/dhall/tests/normalization/success/unit/TextLitNested2B.dhall
deleted file mode 100644
index 631a6cf..0000000
--- a/dhall/tests/normalization/success/unit/TextLitNested2B.dhall
+++ /dev/null
@@ -1 +0,0 @@
-λ(x : Text) → x
diff --git a/dhall/tests/normalization/success/unit/TextLitNested3A.dhall b/dhall/tests/normalization/success/unit/TextLitNested3A.dhall
deleted file mode 100644
index d57ac64..0000000
--- a/dhall/tests/normalization/success/unit/TextLitNested3A.dhall
+++ /dev/null
@@ -1 +0,0 @@
-λ(x: Text) → "${"${""}"}${x}"
diff --git a/dhall/tests/normalization/success/unit/TextLitNested3B.dhall b/dhall/tests/normalization/success/unit/TextLitNested3B.dhall
deleted file mode 100644
index 631a6cf..0000000
--- a/dhall/tests/normalization/success/unit/TextLitNested3B.dhall
+++ /dev/null
@@ -1 +0,0 @@
-λ(x : Text) → x
diff --git a/dhall/tests/normalization/success/unit/TextShowEmptyA.dhall b/dhall/tests/normalization/success/unit/TextShowEmptyA.dhall
deleted file mode 100644
index 589f65d..0000000
--- a/dhall/tests/normalization/success/unit/TextShowEmptyA.dhall
+++ /dev/null
@@ -1 +0,0 @@
-Text/show ""
diff --git a/dhall/tests/normalization/success/unit/TextShowEmptyB.dhall b/dhall/tests/normalization/success/unit/TextShowEmptyB.dhall
deleted file mode 100644
index 8fbbe76..0000000
--- a/dhall/tests/normalization/success/unit/TextShowEmptyB.dhall
+++ /dev/null
@@ -1 +0,0 @@
-"\"\""
diff --git a/dhall/tests/parser/failure/unit/AssertNoAnnotation.dhall b/dhall/tests/parser/failure/unit/AssertNoAnnotation.dhall
deleted file mode 100644
index 6019020..0000000
--- a/dhall/tests/parser/failure/unit/AssertNoAnnotation.dhall
+++ /dev/null
@@ -1 +0,0 @@
-assert
diff --git a/dhall/tests/parser/success/unit/EmptyRecordLiteralA.dhall b/dhall/tests/parser/success/unit/EmptyRecordLiteralA.dhall
deleted file mode 100644
index 339130f..0000000
--- a/dhall/tests/parser/success/unit/EmptyRecordLiteralA.dhall
+++ /dev/null
@@ -1 +0,0 @@
-{=}
diff --git a/dhall/tests/parser/success/unit/EmptyRecordLiteralB.dhallb b/dhall/tests/parser/success/unit/EmptyRecordLiteralB.dhallb
deleted file mode 100644
index 58e2e39..0000000
--- a/dhall/tests/parser/success/unit/EmptyRecordLiteralB.dhallb
+++ /dev/null
@@ -1 +0,0 @@
-‚ 
\ No newline at end of file
diff --git a/dhall/tests/parser/success/unit/EmptyRecordLiteralB.diag b/dhall/tests/parser/success/unit/EmptyRecordLiteralB.diag
deleted file mode 100644
index 8ead206..0000000
--- a/dhall/tests/parser/success/unit/EmptyRecordLiteralB.diag
+++ /dev/null
@@ -1 +0,0 @@
-[8, {}]
diff --git a/dhall/tests/parser/success/unit/LetAnnotA.dhall b/dhall/tests/parser/success/unit/LetAnnotA.dhall
deleted file mode 100644
index c7d29f8..0000000
--- a/dhall/tests/parser/success/unit/LetAnnotA.dhall
+++ /dev/null
@@ -1 +0,0 @@
-let x: T = y in e
diff --git a/dhall/tests/parser/success/unit/LetAnnotB.dhallb b/dhall/tests/parser/success/unit/LetAnnotB.dhallb
deleted file mode 100644
index 4e3a7e4..0000000
--- a/dhall/tests/parser/success/unit/LetAnnotB.dhallb
+++ /dev/null
diff --git a/dhall/tests/parser/success/unit/LetAnnotB.diag b/dhall/tests/parser/success/unit/LetAnnotB.diag
deleted file mode 100644
index 36791e0..0000000
--- a/dhall/tests/parser/success/unit/LetAnnotB.diag
+++ /dev/null
@@ -1 +0,0 @@
-[25, "x", ["T", 0], ["y", 0], ["e", 0]]
diff --git a/dhall/tests/parser/success/unit/LetNoAnnotA.dhall b/dhall/tests/parser/success/unit/LetNoAnnotA.dhall
deleted file mode 100644
index 64d30e6..0000000
--- a/dhall/tests/parser/success/unit/LetNoAnnotA.dhall
+++ /dev/null
@@ -1 +0,0 @@
-let x = y in e
diff --git a/dhall/tests/parser/success/unit/LetNoAnnotB.dhallb b/dhall/tests/parser/success/unit/LetNoAnnotB.dhallb
deleted file mode 100644
index 79a2384..0000000
--- a/dhall/tests/parser/success/unit/LetNoAnnotB.dhallb
+++ /dev/null
diff --git a/dhall/tests/parser/success/unit/LetNoAnnotB.diag b/dhall/tests/parser/success/unit/LetNoAnnotB.diag
deleted file mode 100644
index a23f605..0000000
--- a/dhall/tests/parser/success/unit/LetNoAnnotB.diag
+++ /dev/null
@@ -1 +0,0 @@
-[25, "x", null, ["y", 0], ["e", 0]]
diff --git a/dhall/tests/parser/success/unit/ToMapA.dhall b/dhall/tests/parser/success/unit/ToMapA.dhall
deleted file mode 100644
index ea04391..0000000
--- a/dhall/tests/parser/success/unit/ToMapA.dhall
+++ /dev/null
@@ -1 +0,0 @@
-toMap x
diff --git a/dhall/tests/parser/success/unit/ToMapAnnotA.dhall b/dhall/tests/parser/success/unit/ToMapAnnotA.dhall
deleted file mode 100644
index ad65b07..0000000
--- a/dhall/tests/parser/success/unit/ToMapAnnotA.dhall
+++ /dev/null
@@ -1 +0,0 @@
-toMap x : T
diff --git a/dhall/tests/parser/success/unit/ToMapAnnotB.dhallb b/dhall/tests/parser/success/unit/ToMapAnnotB.dhallb
deleted file mode 100644
index 4b53587..0000000
--- a/dhall/tests/parser/success/unit/ToMapAnnotB.dhallb
+++ /dev/null
diff --git a/dhall/tests/parser/success/unit/ToMapAnnotB.diag b/dhall/tests/parser/success/unit/ToMapAnnotB.diag
deleted file mode 100644
index 8e511fb..0000000
--- a/dhall/tests/parser/success/unit/ToMapAnnotB.diag
+++ /dev/null
@@ -1 +0,0 @@
-[27, ["x", 0], ["T", 0]]
diff --git a/dhall/tests/parser/success/unit/ToMapB.dhallb b/dhall/tests/parser/success/unit/ToMapB.dhallb
deleted file mode 100644
index 25ecd95..0000000
--- a/dhall/tests/parser/success/unit/ToMapB.dhallb
+++ /dev/null
diff --git a/dhall/tests/parser/success/unit/ToMapB.diag b/dhall/tests/parser/success/unit/ToMapB.diag
deleted file mode 100644
index 5d25b39..0000000
--- a/dhall/tests/parser/success/unit/ToMapB.diag
+++ /dev/null
@@ -1 +0,0 @@
-[27, ["x", 0]]
diff --git a/dhall/tests/parser/success/unit/VariableQuotedWithSpaceA.dhall b/dhall/tests/parser/success/unit/VariableQuotedWithSpaceA.dhall
deleted file mode 100644
index a1f4d02..0000000
--- a/dhall/tests/parser/success/unit/VariableQuotedWithSpaceA.dhall
+++ /dev/null
@@ -1 +0,0 @@
-` x `
diff --git a/dhall/tests/parser/success/unit/VariableQuotedWithSpaceB.dhallb b/dhall/tests/parser/success/unit/VariableQuotedWithSpaceB.dhallb
deleted file mode 100644
index 56d9cd9..0000000
--- a/dhall/tests/parser/success/unit/VariableQuotedWithSpaceB.dhallb
+++ /dev/null
diff --git a/dhall/tests/parser/success/unit/VariableQuotedWithSpaceB.diag b/dhall/tests/parser/success/unit/VariableQuotedWithSpaceB.diag
deleted file mode 100644
index 035d650..0000000
--- a/dhall/tests/parser/success/unit/VariableQuotedWithSpaceB.diag
+++ /dev/null
@@ -1 +0,0 @@
-[" x ", 0]
diff --git a/dhall/tests/type-inference/failure/SortInLet.dhall b/dhall/tests/type-inference/failure/SortInLet.dhall
deleted file mode 100644
index b19b882..0000000
--- a/dhall/tests/type-inference/failure/SortInLet.dhall
+++ /dev/null
@@ -1 +0,0 @@
-let x = Sort in 0
diff --git a/dhall/tests/type-inference/failure/unit/FunctionTypeOutputTypeNotAType.dhall b/dhall/tests/type-inference/failure/unit/FunctionTypeOutputTypeNotAType.dhall
deleted file mode 100644
index 94b32f9..0000000
--- a/dhall/tests/type-inference/failure/unit/FunctionTypeOutputTypeNotAType.dhall
+++ /dev/null
@@ -1 +0,0 @@
-Bool -> 1
diff --git a/dhall/tests/type-inference/failure/unit/LetInSort.dhall b/dhall/tests/type-inference/failure/unit/LetInSort.dhall
deleted file mode 100644
index 125ab28..0000000
--- a/dhall/tests/type-inference/failure/unit/LetInSort.dhall
+++ /dev/null
@@ -1 +0,0 @@
-\(x: let x = 0 in Sort) -> 1
diff --git a/dhall/tests/type-inference/failure/unit/MergeBool.dhall b/dhall/tests/type-inference/failure/unit/MergeBool.dhall
deleted file mode 100644
index 01e7e3f..0000000
--- a/dhall/tests/type-inference/failure/unit/MergeBool.dhall
+++ /dev/null
@@ -1 +0,0 @@
-\(x: { True: Natural, False: Natural }) -> merge x True
diff --git a/dhall/tests/type-inference/failure/unit/NestedAnnotInnerWrong.dhall b/dhall/tests/type-inference/failure/unit/NestedAnnotInnerWrong.dhall
deleted file mode 100644
index 7e5c8ec..0000000
--- a/dhall/tests/type-inference/failure/unit/NestedAnnotInnerWrong.dhall
+++ /dev/null
@@ -1 +0,0 @@
-(0 : Bool) : Natural
diff --git a/dhall/tests/type-inference/failure/unit/NestedAnnotOuterWrong.dhall b/dhall/tests/type-inference/failure/unit/NestedAnnotOuterWrong.dhall
deleted file mode 100644
index 67a1526..0000000
--- a/dhall/tests/type-inference/failure/unit/NestedAnnotOuterWrong.dhall
+++ /dev/null
@@ -1 +0,0 @@
-(0 : Natural) : Bool
diff --git a/dhall/tests/type-inference/success/CacheImportsA.dhall b/dhall/tests/type-inference/success/CacheImportsA.dhall
deleted file mode 100644
index 7180b19..0000000
--- a/dhall/tests/type-inference/success/CacheImportsA.dhall
+++ /dev/null
@@ -1,6 +0,0 @@
-{-
-    This URL returns (probably) a different result for each request. This test
-    ensures that import results for a given URL are correctly cached within an
-    execution of dhall.
--}
-let _ = assert : https://csrng.net/csrng/csrng.php?min=0&max=1000 as Text === https://csrng.net/csrng/csrng.php?min=0&max=1000 as Text in 0
diff --git a/dhall/tests/type-inference/success/CacheImportsB.dhall b/dhall/tests/type-inference/success/CacheImportsB.dhall
deleted file mode 100644
index 2f184a4..0000000
--- a/dhall/tests/type-inference/success/CacheImportsB.dhall
+++ /dev/null
@@ -1 +0,0 @@
-Natural
diff --git a/dhall/tests/type-inference/success/CacheImportsCanonicalizeA.dhall b/dhall/tests/type-inference/success/CacheImportsCanonicalizeA.dhall
deleted file mode 100644
index e7f4dcd..0000000
--- a/dhall/tests/type-inference/success/CacheImportsCanonicalizeA.dhall
+++ /dev/null
@@ -1,5 +0,0 @@
-{-
-    This URL returns (probably) a different result for each request. This test
-    ensures that import locations are canonicalized before being cached.
--}
-let _ = assert : https://csrng.net/csrng/csrng.php?min=0&max=1000 as Text === https://csrng.net/csrng/../csrng/csrng.php?min=0&max=1000 as Text in 0
diff --git a/dhall/tests/type-inference/success/CacheImportsCanonicalizeB.dhall b/dhall/tests/type-inference/success/CacheImportsCanonicalizeB.dhall
deleted file mode 100644
index 2f184a4..0000000
--- a/dhall/tests/type-inference/success/CacheImportsCanonicalizeB.dhall
+++ /dev/null
@@ -1 +0,0 @@
-Natural
diff --git a/dhall/tests/type-inference/success/regression/LambdaInLetScoping1A.dhall b/dhall/tests/type-inference/success/regression/LambdaInLetScoping1A.dhall
deleted file mode 100644
index 72f866f..0000000
--- a/dhall/tests/type-inference/success/regression/LambdaInLetScoping1A.dhall
+++ /dev/null
@@ -1 +0,0 @@
-let T = 0 in λ(T : Type) → λ(x : T) → 1
diff --git a/dhall/tests/type-inference/success/regression/LambdaInLetScoping1B.dhall b/dhall/tests/type-inference/success/regression/LambdaInLetScoping1B.dhall
deleted file mode 100644
index 42bfeec..0000000
--- a/dhall/tests/type-inference/success/regression/LambdaInLetScoping1B.dhall
+++ /dev/null
@@ -1 +0,0 @@
-∀(T : Type) → ∀(x : T) → Natural
diff --git a/dhall/tests/type-inference/success/regression/LambdaInLetScoping2A.dhall b/dhall/tests/type-inference/success/regression/LambdaInLetScoping2A.dhall
deleted file mode 100644
index 30fd03c..0000000
--- a/dhall/tests/type-inference/success/regression/LambdaInLetScoping2A.dhall
+++ /dev/null
@@ -1 +0,0 @@
-(λ(T : Type) → let x = 0 in λ(x : T) → x) : ∀(T : Type) → ∀(x : T) → T
diff --git a/dhall/tests/type-inference/success/regression/LambdaInLetScoping2B.dhall b/dhall/tests/type-inference/success/regression/LambdaInLetScoping2B.dhall
deleted file mode 100644
index 20aa0d3..0000000
--- a/dhall/tests/type-inference/success/regression/LambdaInLetScoping2B.dhall
+++ /dev/null
@@ -1 +0,0 @@
-∀(T : Type) → ∀(x : T) → T
diff --git a/dhall/tests/type-inference/success/regression/RecursiveRecordTypeMergeTripleCollisionA.dhall b/dhall/tests/type-inference/success/regression/RecursiveRecordTypeMergeTripleCollisionA.dhall
deleted file mode 100644
index c7b7fb4..0000000
--- a/dhall/tests/type-inference/success/regression/RecursiveRecordTypeMergeTripleCollisionA.dhall
+++ /dev/null
@@ -1 +0,0 @@
-{ x : { a : Bool } } â©“ { x : { b : Bool } } â©“ { x : { c : Bool } }
diff --git a/dhall/tests/type-inference/success/regression/RecursiveRecordTypeMergeTripleCollisionB.dhall b/dhall/tests/type-inference/success/regression/RecursiveRecordTypeMergeTripleCollisionB.dhall
deleted file mode 100644
index 245bc9d..0000000
--- a/dhall/tests/type-inference/success/regression/RecursiveRecordTypeMergeTripleCollisionB.dhall
+++ /dev/null
@@ -1 +0,0 @@
-Type
diff --git a/dhall/tests/type-inference/success/regression/TodoA.dhall b/dhall/tests/type-inference/success/regression/TodoA.dhall
deleted file mode 100644
index 9d5ef34..0000000
--- a/dhall/tests/type-inference/success/regression/TodoA.dhall
+++ /dev/null
@@ -1 +0,0 @@
-λ(todo : ∀(a : Type) → a) → todo
diff --git a/dhall/tests/type-inference/success/regression/TodoB.dhall b/dhall/tests/type-inference/success/regression/TodoB.dhall
deleted file mode 100644
index e0091f2..0000000
--- a/dhall/tests/type-inference/success/regression/TodoB.dhall
+++ /dev/null
@@ -1 +0,0 @@
-∀(todo : ∀(a : Type) → a) → ∀(a : Type) → a
diff --git a/tests_buffer b/tests_buffer
index 478edbb..de49f25 100644
--- a/tests_buffer
+++ b/tests_buffer
@@ -10,24 +10,15 @@ binary decoding:
 decode old-style optional literals ?
 
 import:
-success/
-    recover type error
-    recover recursive import error
 failure/
     don't recover cycle
     don't resolve symlinks in canonicalizing
 
 normalization:
-variables across import boundaries
 
 type-inference:
 something that involves destructuring a recordtype after merge
 add some of the more complicated Prelude tests back, like List/enumerate
-success/
-    regression/
-        somehow test that ({ x = { z = 1 } } ∧ { x = { y = 2 } }).x has a type
-        somehow test that the recordtype from List/indexed has a type in both empty and nonempty cases
-        somehow test types added to the Foo/build closures
 failure/
     \(_: Bool) -> assert : (\(_: Bool) -> _) === (\(x: Bool) -> _)
     merge { x = λ(x : Bool) → x } (< x: Bool | y: Natural >.x True)