Move ui outputs to a sensible place

105 files changed, 0 insertions, 600 deletions

diff --git a/dhall/tests/type-errors/SortInLet.txt b/dhall/tests/type-errors/SortInLet.txt
deleted file mode 100644
index 5b88ff7..0000000
--- a/dhall/tests/type-errors/SortInLet.txt
+++ /dev/null
@@ -1 +0,0 @@
-Type error: Unhandled error: Sort
diff --git a/dhall/tests/type-errors/hurkensParadox.txt b/dhall/tests/type-errors/hurkensParadox.txt
deleted file mode 100644
index 6b99615..0000000
--- a/dhall/tests/type-errors/hurkensParadox.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-Type error: error: wrong type of function argument
-  --> <current file>:6:23
-   |
- 1 |     let bottom : Type = ∀(any : Type) → any
- 2 | 
- 3 | in  let not : Type → Type = λ(p : Type) → p → bottom
- 4 | 
-...
-10 |         : pow (pow U) → U
-11 |         =   λ(t : pow (pow U))
-   |                        ^^^ this expects an argument of type: Kind
-   |                            ^ but this has type: Sort
-   |
-   = note: expected type `Kind`
-              found type `Sort`
diff --git a/dhall/tests/type-errors/mixedUnions.txt b/dhall/tests/type-errors/mixedUnions.txt
deleted file mode 100644
index 8e0026d..0000000
--- a/dhall/tests/type-errors/mixedUnions.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: InvalidFieldType
- --> <current file>:1:0
-  |
-1 | < Left : Natural | Right : Type >
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ InvalidFieldType
-  |
diff --git a/dhall/tests/type-errors/recordOfKind.txt b/dhall/tests/type-errors/recordOfKind.txt
deleted file mode 100644
index 5b88ff7..0000000
--- a/dhall/tests/type-errors/recordOfKind.txt
+++ /dev/null
@@ -1 +0,0 @@
-Type error: Unhandled error: Sort
diff --git a/dhall/tests/type-errors/unit/AnnotationRecordWrongFieldName.txt b/dhall/tests/type-errors/unit/AnnotationRecordWrongFieldName.txt
deleted file mode 100644
index 2a754fc..0000000
--- a/dhall/tests/type-errors/unit/AnnotationRecordWrongFieldName.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: annot mismatch: ({ x = 1 } : { x : Natural }) : { y : Natural }
- --> <current file>:1:0
-  |
-1 | { x = 1 } : { y : Natural }
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ annot mismatch: ({ x = 1 } : { x : Natural }) : { y : Natural }
-  |
diff --git a/dhall/tests/type-errors/unit/AnnotationRecordWrongFieldType.txt b/dhall/tests/type-errors/unit/AnnotationRecordWrongFieldType.txt
deleted file mode 100644
index e67edb8..0000000
--- a/dhall/tests/type-errors/unit/AnnotationRecordWrongFieldType.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: annot mismatch: ({ x = 1 } : { x : Natural }) : { x : Text }
- --> <current file>:1:0
-  |
-1 | { x = 1 } : { x : Text }
-  | ^^^^^^^^^^^^^^^^^^^^^^^^ annot mismatch: ({ x = 1 } : { x : Natural }) : { x : Text }
-  |
diff --git a/dhall/tests/type-errors/unit/AssertAlphaTrap.txt b/dhall/tests/type-errors/unit/AssertAlphaTrap.txt
deleted file mode 100644
index 7e27d00..0000000
--- a/dhall/tests/type-errors/unit/AssertAlphaTrap.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: unbound variable ``_``
- --> <current file>:1:46
-  |
-1 | assert : (\(_: Bool) -> _) === (\(x: Bool) -> _)
-  |                                               ^ not found in this scope
-  |
diff --git a/dhall/tests/type-errors/unit/AssertDoubleZeros.txt b/dhall/tests/type-errors/unit/AssertDoubleZeros.txt
deleted file mode 100644
index 12231a0..0000000
--- a/dhall/tests/type-errors/unit/AssertDoubleZeros.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: AssertMismatch
- --> <current file>:1:0
-  |
-1 | assert : -0.0 ≡ +0.0
-  | ^^^^^^^^^^^^^^^^^^^^ AssertMismatch
-  |
diff --git a/dhall/tests/type-errors/unit/AssertNotEquivalence.txt b/dhall/tests/type-errors/unit/AssertNotEquivalence.txt
deleted file mode 100644
index 5973d19..0000000
--- a/dhall/tests/type-errors/unit/AssertNotEquivalence.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: AssertMustTakeEquivalence
- --> <current file>:1:0
-  |
-1 | assert : Bool
-  | ^^^^^^^^^^^^^ AssertMustTakeEquivalence
-  |
diff --git a/dhall/tests/type-errors/unit/AssertTriviallyFalse.txt b/dhall/tests/type-errors/unit/AssertTriviallyFalse.txt
deleted file mode 100644
index 5742022..0000000
--- a/dhall/tests/type-errors/unit/AssertTriviallyFalse.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: AssertMismatch
- --> <current file>:1:0
-  |
-1 | assert : 1 === 2
-  | ^^^^^^^^^^^^^^^^ AssertMismatch
-  |
diff --git a/dhall/tests/type-errors/unit/CompletionMissingRequiredField.txt b/dhall/tests/type-errors/unit/CompletionMissingRequiredField.txt
deleted file mode 100644
index d0a9a01..0000000
--- a/dhall/tests/type-errors/unit/CompletionMissingRequiredField.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Type error: error: annot mismatch: (Example.default ⫽ {=} : { id : Optional Natural }) : { id : Optional Natural, name : Text }
- --> <current file>:1:4
-  |
-...
-6 | in  Example::{=}
-  |     ^^^^^^^^^^^^ annot mismatch: (Example.default ⫽ {=} : { id : Optional Natural }) : { id : Optional Natural, name : Text }
-  |
diff --git a/dhall/tests/type-errors/unit/CompletionWithWrongDefaultType.txt b/dhall/tests/type-errors/unit/CompletionWithWrongDefaultType.txt
deleted file mode 100644
index d4639e9..0000000
--- a/dhall/tests/type-errors/unit/CompletionWithWrongDefaultType.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Type error: error: annot mismatch: (Example.default ⫽ {=} : { id : Optional Natural, name : Bool }) : { id : Optional Natural, name : Text }
- --> <current file>:1:4
-  |
-...
-6 | in  Example::{=}
-  |     ^^^^^^^^^^^^ annot mismatch: (Example.default ⫽ {=} : { id : Optional Natural, name : Bool }) : { id : Optional Natural, name : Text }
-  |
diff --git a/dhall/tests/type-errors/unit/CompletionWithWrongFieldName.txt b/dhall/tests/type-errors/unit/CompletionWithWrongFieldName.txt
deleted file mode 100644
index 0839742..0000000
--- a/dhall/tests/type-errors/unit/CompletionWithWrongFieldName.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Type error: error: annot mismatch: (Example.default ⫽ { nam = "John Doe" } : { id : Optional Natural, nam : Text, name : Text }) : { id : Optional Natural, name : Text }
- --> <current file>:1:4
-  |
-...
-6 | in  Example::{ nam = "John Doe" }
-  |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ annot mismatch: (Example.default ⫽ { nam = "John Doe" } : { id : Optional Natural, nam : Text, name : Text }) : { id : Optional Natural, name : Text }
-  |
diff --git a/dhall/tests/type-errors/unit/CompletionWithWrongOverridenType.txt b/dhall/tests/type-errors/unit/CompletionWithWrongOverridenType.txt
deleted file mode 100644
index 7edef95..0000000
--- a/dhall/tests/type-errors/unit/CompletionWithWrongOverridenType.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Type error: error: annot mismatch: (Example.default ⫽ { name = True } : { id : Optional Natural, name : Bool }) : { id : Optional Natural, name : Text }
- --> <current file>:1:4
-  |
-...
-6 | in  Example::{ name = True }
-  |     ^^^^^^^^^^^^^^^^^^^^^^^^ annot mismatch: (Example.default ⫽ { name = True } : { id : Optional Natural, name : Bool }) : { id : Optional Natural, name : Text }
-  |
diff --git a/dhall/tests/type-errors/unit/EmptyToMap.txt b/dhall/tests/type-errors/unit/EmptyToMap.txt
deleted file mode 100644
index 000fac7..0000000
--- a/dhall/tests/type-errors/unit/EmptyToMap.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: `toMap` applied to an empty record requires a type annotation
- --> <current file>:1:0
-  |
-1 | toMap {=}
-  | ^^^^^^^^^ `toMap` applied to an empty record requires a type annotation
-  |
diff --git a/dhall/tests/type-errors/unit/EquivalenceNotSameType.txt b/dhall/tests/type-errors/unit/EquivalenceNotSameType.txt
deleted file mode 100644
index 12e21e4..0000000
--- a/dhall/tests/type-errors/unit/EquivalenceNotSameType.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: EquivalenceTypeMismatch
- --> <current file>:1:0
-  |
-1 | 1 === False
-  | ^^^^^^^^^^^ EquivalenceTypeMismatch
-  |
diff --git a/dhall/tests/type-errors/unit/EquivalenceNotTerms.txt b/dhall/tests/type-errors/unit/EquivalenceNotTerms.txt
deleted file mode 100644
index 0183c60..0000000
--- a/dhall/tests/type-errors/unit/EquivalenceNotTerms.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: EquivalenceArgumentsMustBeTerms
- --> <current file>:1:0
-  |
-1 | Bool === Bool
-  | ^^^^^^^^^^^^^ EquivalenceArgumentsMustBeTerms
-  |
diff --git a/dhall/tests/type-errors/unit/FunctionApplicationArgumentNotMatch.txt b/dhall/tests/type-errors/unit/FunctionApplicationArgumentNotMatch.txt
deleted file mode 100644
index 07278b8..0000000
--- a/dhall/tests/type-errors/unit/FunctionApplicationArgumentNotMatch.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Type error: error: wrong type of function argument
- --> <current file>:1:1
-  |
-1 | (λ(_ : Natural) → _) True
-  |  ^^^^^^^^^^^^^^^^^^ this expects an argument of type: Natural
-  |                      ^^^^ but this has type: Bool
-  |
-  = note: expected type `Natural`
-             found type `Bool`
diff --git a/dhall/tests/type-errors/unit/FunctionApplicationIsNotFunction.txt b/dhall/tests/type-errors/unit/FunctionApplicationIsNotFunction.txt
deleted file mode 100644
index e46904a..0000000
--- a/dhall/tests/type-errors/unit/FunctionApplicationIsNotFunction.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: expected function, found `Bool`
- --> <current file>:1:0
-  |
-1 | True True
-  | ^^^^ function application requires a function
-  |
diff --git a/dhall/tests/type-errors/unit/FunctionArgumentTypeNotAType.txt b/dhall/tests/type-errors/unit/FunctionArgumentTypeNotAType.txt
deleted file mode 100644
index e84eb15..0000000
--- a/dhall/tests/type-errors/unit/FunctionArgumentTypeNotAType.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Type error: error: Invalid input type: `Natural`
- --> <current file>:1:6
-  |
-1 | λ(_ : 1) → _
-  |       ^ this has type: `Natural`
-  |
-  = help: The input type of a function must have type `Type`, `Kind` or `Sort`
diff --git a/dhall/tests/type-errors/unit/FunctionTypeArgumentTypeNotAType.txt b/dhall/tests/type-errors/unit/FunctionTypeArgumentTypeNotAType.txt
deleted file mode 100644
index 4aa0f4f..0000000
--- a/dhall/tests/type-errors/unit/FunctionTypeArgumentTypeNotAType.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Type error: error: Invalid input type: `Natural`
- --> <current file>:1:0
-  |
-1 | 2 → _
-  | ^ this has type: `Natural`
-  |
-  = help: The input type of a function must have type `Type`, `Kind` or `Sort`
diff --git a/dhall/tests/type-errors/unit/FunctionTypeKindSort.txt b/dhall/tests/type-errors/unit/FunctionTypeKindSort.txt
deleted file mode 100644
index 5b88ff7..0000000
--- a/dhall/tests/type-errors/unit/FunctionTypeKindSort.txt
+++ /dev/null
@@ -1 +0,0 @@
-Type error: Unhandled error: Sort
diff --git a/dhall/tests/type-errors/unit/FunctionTypeTypeSort.txt b/dhall/tests/type-errors/unit/FunctionTypeTypeSort.txt
deleted file mode 100644
index 5b88ff7..0000000
--- a/dhall/tests/type-errors/unit/FunctionTypeTypeSort.txt
+++ /dev/null
@@ -1 +0,0 @@
-Type error: Unhandled error: Sort
diff --git a/dhall/tests/type-errors/unit/HeterogenousToMap.txt b/dhall/tests/type-errors/unit/HeterogenousToMap.txt
deleted file mode 100644
index 2f8abf2..0000000
--- a/dhall/tests/type-errors/unit/HeterogenousToMap.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: Every field of the record must have the same type
- --> <current file>:1:0
-  |
-1 | toMap { foo= 1, bar= "Bar" }
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Every field of the record must have the same type
-  |
diff --git a/dhall/tests/type-errors/unit/IfBranchesNotMatch.txt b/dhall/tests/type-errors/unit/IfBranchesNotMatch.txt
deleted file mode 100644
index d58af95..0000000
--- a/dhall/tests/type-errors/unit/IfBranchesNotMatch.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: IfBranchMismatch
- --> <current file>:1:0
-  |
-1 | if True then 1 else ""
-  | ^^^^^^^^^^^^^^^^^^^^^^ IfBranchMismatch
-  |
diff --git a/dhall/tests/type-errors/unit/IfBranchesNotType.txt b/dhall/tests/type-errors/unit/IfBranchesNotType.txt
deleted file mode 100644
index b70ac5f..0000000
--- a/dhall/tests/type-errors/unit/IfBranchesNotType.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: IfBranchMustBeTerm
- --> <current file>:1:0
-  |
-1 | if True then Type else Type
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^ IfBranchMustBeTerm
-  |
diff --git a/dhall/tests/type-errors/unit/IfNotBool.txt b/dhall/tests/type-errors/unit/IfNotBool.txt
deleted file mode 100644
index eb5ff42..0000000
--- a/dhall/tests/type-errors/unit/IfNotBool.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: InvalidPredicate
- --> <current file>:1:0
-  |
-1 | if 1 then 1 else 1
-  | ^^^^^^^^^^^^^^^^^^ InvalidPredicate
-  |
diff --git a/dhall/tests/type-errors/unit/LetWithWrongAnnotation.txt b/dhall/tests/type-errors/unit/LetWithWrongAnnotation.txt
deleted file mode 100644
index 5ba4b35..0000000
--- a/dhall/tests/type-errors/unit/LetWithWrongAnnotation.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: annot mismatch: (True : Bool) : Natural
- --> <current file>:1:8
-  |
-1 | let x : Natural = True in True
-  |         ^^^^^^^ annot mismatch: (True : Bool) : Natural
-  |
diff --git a/dhall/tests/type-errors/unit/ListLiteralEmptyNotType.txt b/dhall/tests/type-errors/unit/ListLiteralEmptyNotType.txt
deleted file mode 100644
index 2ca5819..0000000
--- a/dhall/tests/type-errors/unit/ListLiteralEmptyNotType.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Type error: error: wrong type of function argument
- --> <current file>:1:5
-  |
-1 | [] : List Type
-  |      ^^^^ this expects an argument of type: Type
-  |           ^^^^ but this has type: Kind
-  |
-  = note: expected type `Type`
-             found type `Kind`
diff --git a/dhall/tests/type-errors/unit/ListLiteralNotType.txt b/dhall/tests/type-errors/unit/ListLiteralNotType.txt
deleted file mode 100644
index 62d69e5..0000000
--- a/dhall/tests/type-errors/unit/ListLiteralNotType.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: InvalidListType
- --> <current file>:1:0
-  |
-1 | [ Bool ]
-  | ^^^^^^^^ InvalidListType
-  |
diff --git a/dhall/tests/type-errors/unit/ListLiteralTypesNotMatch.txt b/dhall/tests/type-errors/unit/ListLiteralTypesNotMatch.txt
deleted file mode 100644
index 33e007d..0000000
--- a/dhall/tests/type-errors/unit/ListLiteralTypesNotMatch.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: InvalidListElement
- --> <current file>:1:0
-  |
-1 | [ True, 1 ]
-  | ^^^^^^^^^^^ InvalidListElement
-  |
diff --git a/dhall/tests/type-errors/unit/MergeAlternativeHasNoHandler.txt b/dhall/tests/type-errors/unit/MergeAlternativeHasNoHandler.txt
deleted file mode 100644
index a4a967a..0000000
--- a/dhall/tests/type-errors/unit/MergeAlternativeHasNoHandler.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: MergeVariantMissingHandler
- --> <current file>:1:0
-  |
-1 | merge {=} (< x : Bool >.x True)
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ MergeVariantMissingHandler
-  |
diff --git a/dhall/tests/type-errors/unit/MergeAnnotationMismatch.txt b/dhall/tests/type-errors/unit/MergeAnnotationMismatch.txt
deleted file mode 100644
index 9175f33..0000000
--- a/dhall/tests/type-errors/unit/MergeAnnotationMismatch.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: MergeAnnotMismatch
- --> <current file>:1:0
-  |
-1 | merge { x = 0 } < x >.x : Bool
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ MergeAnnotMismatch
-  |
diff --git a/dhall/tests/type-errors/unit/MergeAnnotationNotType.txt b/dhall/tests/type-errors/unit/MergeAnnotationNotType.txt
deleted file mode 100644
index 1173f0c..0000000
--- a/dhall/tests/type-errors/unit/MergeAnnotationNotType.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: Merge2ArgMustBeUnionOrOptional
- --> <current file>:1:0
-  |
-1 | merge {=} <> : Type
-  | ^^^^^^^^^^^^^^^^^^^ Merge2ArgMustBeUnionOrOptional
-  |
diff --git a/dhall/tests/type-errors/unit/MergeEmptyNeedsDirectAnnotation1.txt b/dhall/tests/type-errors/unit/MergeEmptyNeedsDirectAnnotation1.txt
deleted file mode 100644
index 94442e0..0000000
--- a/dhall/tests/type-errors/unit/MergeEmptyNeedsDirectAnnotation1.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: MergeEmptyNeedsAnnotation
- --> <current file>:1:13
-  |
-1 | \(x: <>) -> (merge {=} x) : Bool
-  |              ^^^^^^^^^^^ MergeEmptyNeedsAnnotation
-  |
diff --git a/dhall/tests/type-errors/unit/MergeEmptyNeedsDirectAnnotation2.txt b/dhall/tests/type-errors/unit/MergeEmptyNeedsDirectAnnotation2.txt
deleted file mode 100644
index 5dcffdf..0000000
--- a/dhall/tests/type-errors/unit/MergeEmptyNeedsDirectAnnotation2.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: MergeEmptyNeedsAnnotation
- --> <current file>:1:26
-  |
-1 | \(x: <>) -> let y: Bool = merge {=} x in 1
-  |                           ^^^^^^^^^^^ MergeEmptyNeedsAnnotation
-  |
diff --git a/dhall/tests/type-errors/unit/MergeEmptyWithoutAnnotation.txt b/dhall/tests/type-errors/unit/MergeEmptyWithoutAnnotation.txt
deleted file mode 100644
index bf45123..0000000
--- a/dhall/tests/type-errors/unit/MergeEmptyWithoutAnnotation.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: Merge2ArgMustBeUnionOrOptional
- --> <current file>:1:0
-  |
-1 | merge {=} <>
-  | ^^^^^^^^^^^^ Merge2ArgMustBeUnionOrOptional
-  |
diff --git a/dhall/tests/type-errors/unit/MergeHandlerNotFunction.txt b/dhall/tests/type-errors/unit/MergeHandlerNotFunction.txt
deleted file mode 100644
index 8528f90..0000000
--- a/dhall/tests/type-errors/unit/MergeHandlerNotFunction.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Type error: error: merge handler is not a function
- --> <current file>:1:0
-  |
-1 | merge { x = True } (< x : Bool >.x True)
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ in this merge expression
-  |       ^^^^^^^^^^^^ the handler for `x` has type: `Bool`
-  |                     ------------------- help: the corresponding variant has type: `Bool`
-  |
-  = help: a handler for this variant must be a function that takes an input of type: `Bool`
diff --git a/dhall/tests/type-errors/unit/MergeHandlerNotInUnion.txt b/dhall/tests/type-errors/unit/MergeHandlerNotInUnion.txt
deleted file mode 100644
index 3159340..0000000
--- a/dhall/tests/type-errors/unit/MergeHandlerNotInUnion.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: Merge2ArgMustBeUnionOrOptional
- --> <current file>:1:0
-  |
-1 | merge { x = λ(_ : Bool) → _ } <> : Bool
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Merge2ArgMustBeUnionOrOptional
-  |
diff --git a/dhall/tests/type-errors/unit/MergeHandlerNotMatchAlternativeType.txt b/dhall/tests/type-errors/unit/MergeHandlerNotMatchAlternativeType.txt
deleted file mode 100644
index c2229bd..0000000
--- a/dhall/tests/type-errors/unit/MergeHandlerNotMatchAlternativeType.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Type error: error: Wrong handler input type
- --> <current file>:1:0
-  |
-1 | merge { x = λ(_ : Bool) → _ } (< x : Natural >.x 1)
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ in this merge expression
-  |       ^^^^^^^^^^^^^^^^^^^^^^^ the handler for `x` expects a value of type: `Bool`
-  |                                ^^^^^^^^^^^^^^^^^^^ but the corresponding variant has type: `Natural`
-  |
diff --git a/dhall/tests/type-errors/unit/MergeHandlersWithDifferentType.txt b/dhall/tests/type-errors/unit/MergeHandlersWithDifferentType.txt
deleted file mode 100644
index 47f3de7..0000000
--- a/dhall/tests/type-errors/unit/MergeHandlersWithDifferentType.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: MergeHandlerTypeMismatch
- --> <current file>:1:0
-  |
-1 | merge { x = λ(_ : Bool) → _, y = λ(_ : Natural) → _ } (< x : Bool | y : Natural >.x True)
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ MergeHandlerTypeMismatch
-  |
diff --git a/dhall/tests/type-errors/unit/MergeLhsNotRecord.txt b/dhall/tests/type-errors/unit/MergeLhsNotRecord.txt
deleted file mode 100644
index f27dddd..0000000
--- a/dhall/tests/type-errors/unit/MergeLhsNotRecord.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: Merge1ArgMustBeRecord
- --> <current file>:1:0
-  |
-1 | merge True < x >.x
-  | ^^^^^^^^^^^^^^^^^^ Merge1ArgMustBeRecord
-  |
diff --git a/dhall/tests/type-errors/unit/MergeMissingHandler1.txt b/dhall/tests/type-errors/unit/MergeMissingHandler1.txt
deleted file mode 100644
index af58d05..0000000
--- a/dhall/tests/type-errors/unit/MergeMissingHandler1.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: MergeVariantMissingHandler
- --> <current file>:1:0
-  |
-1 | merge {=} <x>.x
-  | ^^^^^^^^^^^^^^^ MergeVariantMissingHandler
-  |
diff --git a/dhall/tests/type-errors/unit/MergeMissingHandler2.txt b/dhall/tests/type-errors/unit/MergeMissingHandler2.txt
deleted file mode 100644
index 49484df..0000000
--- a/dhall/tests/type-errors/unit/MergeMissingHandler2.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: MergeVariantMissingHandler
- --> <current file>:1:0
-  |
-1 | merge { x = 0 } <x | y>.x
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^ MergeVariantMissingHandler
-  |
diff --git a/dhall/tests/type-errors/unit/MergeRhsNotUnion.txt b/dhall/tests/type-errors/unit/MergeRhsNotUnion.txt
deleted file mode 100644
index 0108725..0000000
--- a/dhall/tests/type-errors/unit/MergeRhsNotUnion.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: Merge2ArgMustBeUnionOrOptional
- --> <current file>:1:0
-  |
-1 | merge {=} True
-  | ^^^^^^^^^^^^^^ Merge2ArgMustBeUnionOrOptional
-  |
diff --git a/dhall/tests/type-errors/unit/MergeUnusedHandler.txt b/dhall/tests/type-errors/unit/MergeUnusedHandler.txt
deleted file mode 100644
index 2afe376..0000000
--- a/dhall/tests/type-errors/unit/MergeUnusedHandler.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: MergeHandlerMissingVariant
- --> <current file>:1:0
-  |
-1 | merge { x = 1, y = 2 } < x >.x
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ MergeHandlerMissingVariant
-  |
diff --git a/dhall/tests/type-errors/unit/MistypedToMap1.txt b/dhall/tests/type-errors/unit/MistypedToMap1.txt
deleted file mode 100644
index 14d9791..0000000
--- a/dhall/tests/type-errors/unit/MistypedToMap1.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: Annotation mismatch
- --> <current file>:1:0
-  |
-1 | toMap { foo= 1, bar= 4 } : Natural
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Annotation mismatch
-  |
diff --git a/dhall/tests/type-errors/unit/MistypedToMap2.txt b/dhall/tests/type-errors/unit/MistypedToMap2.txt
deleted file mode 100644
index 88e303e..0000000
--- a/dhall/tests/type-errors/unit/MistypedToMap2.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: Annotation mismatch
- --> <current file>:1:0
-  |
-1 | toMap { foo= 1, bar= 4 } : List Natural
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Annotation mismatch
-  |
diff --git a/dhall/tests/type-errors/unit/MistypedToMap3.txt b/dhall/tests/type-errors/unit/MistypedToMap3.txt
deleted file mode 100644
index 6b3772d..0000000
--- a/dhall/tests/type-errors/unit/MistypedToMap3.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: Annotation mismatch
- --> <current file>:1:0
-  |
-1 | toMap { foo= 1, bar= 4 } : List { mapKey : Natural, mapValue : Natural }
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Annotation mismatch
-  |
diff --git a/dhall/tests/type-errors/unit/MistypedToMap4.txt b/dhall/tests/type-errors/unit/MistypedToMap4.txt
deleted file mode 100644
index e0cf651..0000000
--- a/dhall/tests/type-errors/unit/MistypedToMap4.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: Annotation mismatch
- --> <current file>:1:0
-  |
-1 | toMap { foo= 1, bar= 4 } : List { mapKey : Text, mapValue : Text }
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Annotation mismatch
-  |
diff --git a/dhall/tests/type-errors/unit/NaturalSubtractNotNatural.txt b/dhall/tests/type-errors/unit/NaturalSubtractNotNatural.txt
deleted file mode 100644
index ac336a6..0000000
--- a/dhall/tests/type-errors/unit/NaturalSubtractNotNatural.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-Type error: error: wrong type of function argument
- --> <current file>:1:0
-  |
-1 | Natural/subtract True True
-  | ^^^^^^^^^^^^^^^^ this expects an argument of type: Natural
-  |                  ^^^^ but this has type: Bool
-  |
-  = note: expected type `Natural`
-             found type `Bool`
diff --git a/dhall/tests/type-errors/unit/NonRecordToMap.txt b/dhall/tests/type-errors/unit/NonRecordToMap.txt
deleted file mode 100644
index 8e83002..0000000
--- a/dhall/tests/type-errors/unit/NonRecordToMap.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: The argument to `toMap` must be a record
- --> <current file>:1:0
-  |
-1 | toMap "text"
-  | ^^^^^^^^^^^^ The argument to `toMap` must be a record
-  |
diff --git a/dhall/tests/type-errors/unit/OperatorAndNotBool.txt b/dhall/tests/type-errors/unit/OperatorAndNotBool.txt
deleted file mode 100644
index f6ea50b..0000000
--- a/dhall/tests/type-errors/unit/OperatorAndNotBool.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: BinOpTypeMismatch
- --> <current file>:1:0
-  |
-1 | 1 && 1
-  | ^^^^^^ BinOpTypeMismatch
-  |
diff --git a/dhall/tests/type-errors/unit/OperatorEqualNotBool.txt b/dhall/tests/type-errors/unit/OperatorEqualNotBool.txt
deleted file mode 100644
index 8662c16..0000000
--- a/dhall/tests/type-errors/unit/OperatorEqualNotBool.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: BinOpTypeMismatch
- --> <current file>:1:0
-  |
-1 | 1 == 1
-  | ^^^^^^ BinOpTypeMismatch
-  |
diff --git a/dhall/tests/type-errors/unit/OperatorListConcatenateLhsNotList.txt b/dhall/tests/type-errors/unit/OperatorListConcatenateLhsNotList.txt
deleted file mode 100644
index 8075b99..0000000
--- a/dhall/tests/type-errors/unit/OperatorListConcatenateLhsNotList.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: BinOpTypeMismatch
- --> <current file>:1:0
-  |
-1 | 1 # [ True ]
-  | ^^^^^^^^^^^^ BinOpTypeMismatch
-  |
diff --git a/dhall/tests/type-errors/unit/OperatorListConcatenateListsNotMatch.txt b/dhall/tests/type-errors/unit/OperatorListConcatenateListsNotMatch.txt
deleted file mode 100644
index 9e404f8..0000000
--- a/dhall/tests/type-errors/unit/OperatorListConcatenateListsNotMatch.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: BinOpTypeMismatch
- --> <current file>:1:0
-  |
-1 | [ True ] # [ 1 ]
-  | ^^^^^^^^^^^^^^^^ BinOpTypeMismatch
-  |
diff --git a/dhall/tests/type-errors/unit/OperatorListConcatenateNotListsButMatch.txt b/dhall/tests/type-errors/unit/OperatorListConcatenateNotListsButMatch.txt
deleted file mode 100644
index fffc898..0000000
--- a/dhall/tests/type-errors/unit/OperatorListConcatenateNotListsButMatch.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: BinOpTypeMismatch
- --> <current file>:1:0
-  |
-1 | 1 # 2
-  | ^^^^^ BinOpTypeMismatch
-  |
diff --git a/dhall/tests/type-errors/unit/OperatorListConcatenateRhsNotList.txt b/dhall/tests/type-errors/unit/OperatorListConcatenateRhsNotList.txt
deleted file mode 100644
index 2ba0b91..0000000
--- a/dhall/tests/type-errors/unit/OperatorListConcatenateRhsNotList.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: BinOpTypeMismatch
- --> <current file>:1:0
-  |
-1 | [ True ] # 1
-  | ^^^^^^^^^^^^ BinOpTypeMismatch
-  |
diff --git a/dhall/tests/type-errors/unit/OperatorNotEqualNotBool.txt b/dhall/tests/type-errors/unit/OperatorNotEqualNotBool.txt
deleted file mode 100644
index ac04fd4..0000000
--- a/dhall/tests/type-errors/unit/OperatorNotEqualNotBool.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: BinOpTypeMismatch
- --> <current file>:1:0
-  |
-1 | 1 != 1
-  | ^^^^^^ BinOpTypeMismatch
-  |
diff --git a/dhall/tests/type-errors/unit/OperatorOrNotBool.txt b/dhall/tests/type-errors/unit/OperatorOrNotBool.txt
deleted file mode 100644
index 9e1c4fb..0000000
--- a/dhall/tests/type-errors/unit/OperatorOrNotBool.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: BinOpTypeMismatch
- --> <current file>:1:0
-  |
-1 | 1 || 1
-  | ^^^^^^ BinOpTypeMismatch
-  |
diff --git a/dhall/tests/type-errors/unit/OperatorPlusNotNatural.txt b/dhall/tests/type-errors/unit/OperatorPlusNotNatural.txt
deleted file mode 100644
index 97e0df4..0000000
--- a/dhall/tests/type-errors/unit/OperatorPlusNotNatural.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: BinOpTypeMismatch
- --> <current file>:1:0
-  |
-1 | True + True
-  | ^^^^^^^^^^^ BinOpTypeMismatch
-  |
diff --git a/dhall/tests/type-errors/unit/OperatorTextConcatenateLhsNotText.txt b/dhall/tests/type-errors/unit/OperatorTextConcatenateLhsNotText.txt
deleted file mode 100644
index 679d991..0000000
--- a/dhall/tests/type-errors/unit/OperatorTextConcatenateLhsNotText.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: BinOpTypeMismatch
- --> <current file>:1:0
-  |
-1 | 1 ++ ""
-  | ^^^^^^^ BinOpTypeMismatch
-  |
diff --git a/dhall/tests/type-errors/unit/OperatorTextConcatenateRhsNotText.txt b/dhall/tests/type-errors/unit/OperatorTextConcatenateRhsNotText.txt
deleted file mode 100644
index 85611f7..0000000
--- a/dhall/tests/type-errors/unit/OperatorTextConcatenateRhsNotText.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: BinOpTypeMismatch
- --> <current file>:1:0
-  |
-1 | "" ++ 1
-  | ^^^^^^^ BinOpTypeMismatch
-  |
diff --git a/dhall/tests/type-errors/unit/OperatorTimesNotNatural.txt b/dhall/tests/type-errors/unit/OperatorTimesNotNatural.txt
deleted file mode 100644
index d688ed6..0000000
--- a/dhall/tests/type-errors/unit/OperatorTimesNotNatural.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: BinOpTypeMismatch
- --> <current file>:1:0
-  |
-1 | True * True
-  | ^^^^^^^^^^^ BinOpTypeMismatch
-  |
diff --git a/dhall/tests/type-errors/unit/OptionalDeprecatedSyntaxAbsent.txt b/dhall/tests/type-errors/unit/OptionalDeprecatedSyntaxAbsent.txt
deleted file mode 100644
index bfb36ae..0000000
--- a/dhall/tests/type-errors/unit/OptionalDeprecatedSyntaxAbsent.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: InvalidListType
- --> <current file>:1:0
-  |
-1 | [] : Optional Bool
-  | ^^^^^^^^^^^^^^^^^^ InvalidListType
-  |
diff --git a/dhall/tests/type-errors/unit/OptionalDeprecatedSyntaxPresent.txt b/dhall/tests/type-errors/unit/OptionalDeprecatedSyntaxPresent.txt
deleted file mode 100644
index 5332fcb..0000000
--- a/dhall/tests/type-errors/unit/OptionalDeprecatedSyntaxPresent.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: annot mismatch: ([1] : List Natural) : Optional Natural
- --> <current file>:1:0
-  |
-1 | [ 1 ] : Optional Natural
-  | ^^^^^^^^^^^^^^^^^^^^^^^^ annot mismatch: ([1] : List Natural) : Optional Natural
-  |
diff --git a/dhall/tests/type-errors/unit/RecordLitDuplicateFields.txt b/dhall/tests/type-errors/unit/RecordLitDuplicateFields.txt
deleted file mode 100644
index 608c6a0..0000000
--- a/dhall/tests/type-errors/unit/RecordLitDuplicateFields.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: RecordTypeDuplicateField
- --> <current file>:1:0
-  |
-1 | { x = 0, x = 0 }
-  | ^^^^^^^^^^^^^^^^ RecordTypeDuplicateField
-  |
diff --git a/dhall/tests/type-errors/unit/RecordMixedKinds3.txt b/dhall/tests/type-errors/unit/RecordMixedKinds3.txt
deleted file mode 100644
index 5b88ff7..0000000
--- a/dhall/tests/type-errors/unit/RecordMixedKinds3.txt
+++ /dev/null
@@ -1 +0,0 @@
-Type error: Unhandled error: Sort
diff --git a/dhall/tests/type-errors/unit/RecordProjectionByTypeFieldTypeMismatch.txt b/dhall/tests/type-errors/unit/RecordProjectionByTypeFieldTypeMismatch.txt
deleted file mode 100644
index d624075..0000000
--- a/dhall/tests/type-errors/unit/RecordProjectionByTypeFieldTypeMismatch.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: ProjectionWrongType
- --> <current file>:1:0
-  |
-1 | { y = {=} }.( {y : Natural} )
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ProjectionWrongType
-  |
diff --git a/dhall/tests/type-errors/unit/RecordProjectionByTypeNotPresent.txt b/dhall/tests/type-errors/unit/RecordProjectionByTypeNotPresent.txt
deleted file mode 100644
index c22c2c4..0000000
--- a/dhall/tests/type-errors/unit/RecordProjectionByTypeNotPresent.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: ProjectionMissingEntry
- --> <current file>:1:0
-  |
-1 | { y = {=} }.( {x : Natural} )
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ProjectionMissingEntry
-  |
diff --git a/dhall/tests/type-errors/unit/RecordProjectionDuplicateFields.txt b/dhall/tests/type-errors/unit/RecordProjectionDuplicateFields.txt
deleted file mode 100644
index 5c6520b..0000000
--- a/dhall/tests/type-errors/unit/RecordProjectionDuplicateFields.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: ProjectionDuplicateField
- --> <current file>:1:0
-  |
-1 | { x = 1 }.{ x, x }
-  | ^^^^^^^^^^^^^^^^^^ ProjectionDuplicateField
-  |
diff --git a/dhall/tests/type-errors/unit/RecordProjectionEmpty.txt b/dhall/tests/type-errors/unit/RecordProjectionEmpty.txt
deleted file mode 100644
index 39f263b..0000000
--- a/dhall/tests/type-errors/unit/RecordProjectionEmpty.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: ProjectionMissingEntry
- --> <current file>:1:0
-  |
-1 | {=}.{ x }
-  | ^^^^^^^^^ ProjectionMissingEntry
-  |
diff --git a/dhall/tests/type-errors/unit/RecordProjectionNotPresent.txt b/dhall/tests/type-errors/unit/RecordProjectionNotPresent.txt
deleted file mode 100644
index 032f7a0..0000000
--- a/dhall/tests/type-errors/unit/RecordProjectionNotPresent.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: ProjectionMissingEntry
- --> <current file>:1:0
-  |
-1 | { y = {=} }.{ x }
-  | ^^^^^^^^^^^^^^^^^ ProjectionMissingEntry
-  |
diff --git a/dhall/tests/type-errors/unit/RecordProjectionNotRecord.txt b/dhall/tests/type-errors/unit/RecordProjectionNotRecord.txt
deleted file mode 100644
index 5ed6ffd..0000000
--- a/dhall/tests/type-errors/unit/RecordProjectionNotRecord.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: ProjectionMustBeRecord
- --> <current file>:1:0
-  |
-1 | True.{ x }
-  | ^^^^^^^^^^ ProjectionMustBeRecord
-  |
diff --git a/dhall/tests/type-errors/unit/RecordSelectionEmpty.txt b/dhall/tests/type-errors/unit/RecordSelectionEmpty.txt
deleted file mode 100644
index 5b3b7f8..0000000
--- a/dhall/tests/type-errors/unit/RecordSelectionEmpty.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: MissingRecordField
- --> <current file>:1:0
-  |
-1 | {=}.x
-  | ^^^^^ MissingRecordField
-  |
diff --git a/dhall/tests/type-errors/unit/RecordSelectionNotPresent.txt b/dhall/tests/type-errors/unit/RecordSelectionNotPresent.txt
deleted file mode 100644
index d435ca0..0000000
--- a/dhall/tests/type-errors/unit/RecordSelectionNotPresent.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: MissingRecordField
- --> <current file>:1:0
-  |
-1 | { y = {=} }.x
-  | ^^^^^^^^^^^^^ MissingRecordField
-  |
diff --git a/dhall/tests/type-errors/unit/RecordSelectionNotRecord.txt b/dhall/tests/type-errors/unit/RecordSelectionNotRecord.txt
deleted file mode 100644
index 3f9b7ed..0000000
--- a/dhall/tests/type-errors/unit/RecordSelectionNotRecord.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: NotARecord
- --> <current file>:1:0
-  |
-1 | True.x
-  | ^^^^^^ NotARecord
-  |
diff --git a/dhall/tests/type-errors/unit/RecordSelectionTypeNotUnionType.txt b/dhall/tests/type-errors/unit/RecordSelectionTypeNotUnionType.txt
deleted file mode 100644
index cca28b8..0000000
--- a/dhall/tests/type-errors/unit/RecordSelectionTypeNotUnionType.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: NotARecord
- --> <current file>:1:0
-  |
-1 | Bool.x
-  | ^^^^^^ NotARecord
-  |
diff --git a/dhall/tests/type-errors/unit/RecordTypeDuplicateFields.txt b/dhall/tests/type-errors/unit/RecordTypeDuplicateFields.txt
deleted file mode 100644
index 145a59b..0000000
--- a/dhall/tests/type-errors/unit/RecordTypeDuplicateFields.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: RecordTypeDuplicateField
- --> <current file>:1:0
-  |
-1 | { x: Natural, x: Natural }
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^ RecordTypeDuplicateField
-  |
diff --git a/dhall/tests/type-errors/unit/RecordTypeValueMember.txt b/dhall/tests/type-errors/unit/RecordTypeValueMember.txt
deleted file mode 100644
index 04488ad..0000000
--- a/dhall/tests/type-errors/unit/RecordTypeValueMember.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: InvalidFieldType
- --> <current file>:1:0
-  |
-1 | { x : True }
-  | ^^^^^^^^^^^^ InvalidFieldType
-  |
diff --git a/dhall/tests/type-errors/unit/RecursiveRecordMergeLhsNotRecord.txt b/dhall/tests/type-errors/unit/RecursiveRecordMergeLhsNotRecord.txt
deleted file mode 100644
index f74e839..0000000
--- a/dhall/tests/type-errors/unit/RecursiveRecordMergeLhsNotRecord.txt
+++ /dev/null
@@ -1 +0,0 @@
-Type error: error: RecordTypeMergeRequiresRecordType
diff --git a/dhall/tests/type-errors/unit/RecursiveRecordMergeOverlapping.txt b/dhall/tests/type-errors/unit/RecursiveRecordMergeOverlapping.txt
deleted file mode 100644
index f74e839..0000000
--- a/dhall/tests/type-errors/unit/RecursiveRecordMergeOverlapping.txt
+++ /dev/null
@@ -1 +0,0 @@
-Type error: error: RecordTypeMergeRequiresRecordType
diff --git a/dhall/tests/type-errors/unit/RecursiveRecordMergeRhsNotRecord.txt b/dhall/tests/type-errors/unit/RecursiveRecordMergeRhsNotRecord.txt
deleted file mode 100644
index f74e839..0000000
--- a/dhall/tests/type-errors/unit/RecursiveRecordMergeRhsNotRecord.txt
+++ /dev/null
@@ -1 +0,0 @@
-Type error: error: RecordTypeMergeRequiresRecordType
diff --git a/dhall/tests/type-errors/unit/RecursiveRecordTypeMergeLhsNotRecordType.txt b/dhall/tests/type-errors/unit/RecursiveRecordTypeMergeLhsNotRecordType.txt
deleted file mode 100644
index b35e64b..0000000
--- a/dhall/tests/type-errors/unit/RecursiveRecordTypeMergeLhsNotRecordType.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: RecordTypeMergeRequiresRecordType
- --> <current file>:1:0
-  |
-1 | Bool ⩓ {}
-  | ^^^^^^^^^ RecordTypeMergeRequiresRecordType
-  |
diff --git a/dhall/tests/type-errors/unit/RecursiveRecordTypeMergeOverlapping.txt b/dhall/tests/type-errors/unit/RecursiveRecordTypeMergeOverlapping.txt
deleted file mode 100644
index f74e839..0000000
--- a/dhall/tests/type-errors/unit/RecursiveRecordTypeMergeOverlapping.txt
+++ /dev/null
@@ -1 +0,0 @@
-Type error: error: RecordTypeMergeRequiresRecordType
diff --git a/dhall/tests/type-errors/unit/RecursiveRecordTypeMergeRhsNotRecordType.txt b/dhall/tests/type-errors/unit/RecursiveRecordTypeMergeRhsNotRecordType.txt
deleted file mode 100644
index 0200f97..0000000
--- a/dhall/tests/type-errors/unit/RecursiveRecordTypeMergeRhsNotRecordType.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: RecordTypeMergeRequiresRecordType
- --> <current file>:1:0
-  |
-1 | {} ⩓ Bool
-  | ^^^^^^^^^ RecordTypeMergeRequiresRecordType
-  |
diff --git a/dhall/tests/type-errors/unit/RightBiasedRecordMergeLhsNotRecord.txt b/dhall/tests/type-errors/unit/RightBiasedRecordMergeLhsNotRecord.txt
deleted file mode 100644
index 3b158ce..0000000
--- a/dhall/tests/type-errors/unit/RightBiasedRecordMergeLhsNotRecord.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: MustCombineRecord
- --> <current file>:1:0
-  |
-1 | True ⫽ {=}
-  | ^^^^^^^^^^ MustCombineRecord
-  |
diff --git a/dhall/tests/type-errors/unit/RightBiasedRecordMergeMixedKinds2.txt b/dhall/tests/type-errors/unit/RightBiasedRecordMergeMixedKinds2.txt
deleted file mode 100644
index 5b88ff7..0000000
--- a/dhall/tests/type-errors/unit/RightBiasedRecordMergeMixedKinds2.txt
+++ /dev/null
@@ -1 +0,0 @@
-Type error: Unhandled error: Sort
diff --git a/dhall/tests/type-errors/unit/RightBiasedRecordMergeMixedKinds3.txt b/dhall/tests/type-errors/unit/RightBiasedRecordMergeMixedKinds3.txt
deleted file mode 100644
index 5b88ff7..0000000
--- a/dhall/tests/type-errors/unit/RightBiasedRecordMergeMixedKinds3.txt
+++ /dev/null
@@ -1 +0,0 @@
-Type error: Unhandled error: Sort
diff --git a/dhall/tests/type-errors/unit/RightBiasedRecordMergeRhsNotRecord.txt b/dhall/tests/type-errors/unit/RightBiasedRecordMergeRhsNotRecord.txt
deleted file mode 100644
index 4f9cb0d..0000000
--- a/dhall/tests/type-errors/unit/RightBiasedRecordMergeRhsNotRecord.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: MustCombineRecord
- --> <current file>:1:0
-  |
-1 | {=} ⫽ True
-  | ^^^^^^^^^^ MustCombineRecord
-  |
diff --git a/dhall/tests/type-errors/unit/SomeNotType.txt b/dhall/tests/type-errors/unit/SomeNotType.txt
deleted file mode 100644
index 3584768..0000000
--- a/dhall/tests/type-errors/unit/SomeNotType.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: InvalidOptionalType
- --> <current file>:1:0
-  |
-1 | Some Bool
-  | ^^^^^^^^^ InvalidOptionalType
-  |
diff --git a/dhall/tests/type-errors/unit/Sort.txt b/dhall/tests/type-errors/unit/Sort.txt
deleted file mode 100644
index 5b88ff7..0000000
--- a/dhall/tests/type-errors/unit/Sort.txt
+++ /dev/null
@@ -1 +0,0 @@
-Type error: Unhandled error: Sort
diff --git a/dhall/tests/type-errors/unit/TextLiteralInterpolateNotText.txt b/dhall/tests/type-errors/unit/TextLiteralInterpolateNotText.txt
deleted file mode 100644
index 0132a30..0000000
--- a/dhall/tests/type-errors/unit/TextLiteralInterpolateNotText.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: InvalidTextInterpolation
- --> <current file>:1:0
-  |
-1 | "${1}"
-  | ^^^^^^ InvalidTextInterpolation
-  |
diff --git a/dhall/tests/type-errors/unit/ToMapEmptyInvalidAnnotation.txt b/dhall/tests/type-errors/unit/ToMapEmptyInvalidAnnotation.txt
deleted file mode 100644
index c28073e..0000000
--- a/dhall/tests/type-errors/unit/ToMapEmptyInvalidAnnotation.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-Type error: error: The type of `toMap x` must be of the form `List { mapKey : Text, mapValue : T }`
- --> <current file>:2:0
-  |
-1 | -- The mapKey must be Text
-2 | toMap {=} : List { mapKey : Bool, mapValue : Text }
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ The type of `toMap x` must be of the form `List { mapKey : Text, mapValue : T }`
-  |
diff --git a/dhall/tests/type-errors/unit/ToMapWrongKind.txt b/dhall/tests/type-errors/unit/ToMapWrongKind.txt
deleted file mode 100644
index 8158c08..0000000
--- a/dhall/tests/type-errors/unit/ToMapWrongKind.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: `toMap` only accepts records of type `Type`
- --> <current file>:1:0
-  |
-1 | toMap { x = Bool }
-  | ^^^^^^^^^^^^^^^^^^ `toMap` only accepts records of type `Type`
-  |
diff --git a/dhall/tests/type-errors/unit/TypeAnnotationWrong.txt b/dhall/tests/type-errors/unit/TypeAnnotationWrong.txt
deleted file mode 100644
index 7360e68..0000000
--- a/dhall/tests/type-errors/unit/TypeAnnotationWrong.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: annot mismatch: (1 : Natural) : Bool
- --> <current file>:1:0
-  |
-1 | 1 : Bool
-  | ^^^^^^^^ annot mismatch: (1 : Natural) : Bool
-  |
diff --git a/dhall/tests/type-errors/unit/UnionConstructorFieldNotPresent.txt b/dhall/tests/type-errors/unit/UnionConstructorFieldNotPresent.txt
deleted file mode 100644
index 41d283d..0000000
--- a/dhall/tests/type-errors/unit/UnionConstructorFieldNotPresent.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: MissingUnionField
- --> <current file>:1:0
-  |
-1 | < x : Bool >.y
-  | ^^^^^^^^^^^^^^ MissingUnionField
-  |
diff --git a/dhall/tests/type-errors/unit/UnionDeprecatedConstructorsKeyword.txt b/dhall/tests/type-errors/unit/UnionDeprecatedConstructorsKeyword.txt
deleted file mode 100644
index 91fb96d..0000000
--- a/dhall/tests/type-errors/unit/UnionDeprecatedConstructorsKeyword.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: unbound variable `constructors`
- --> <current file>:1:0
-  |
-1 | constructors < Left : Natural | Right : Bool >
-  | ^^^^^^^^^^^^ not found in this scope
-  |
diff --git a/dhall/tests/type-errors/unit/UnionTypeDuplicateVariants1.txt b/dhall/tests/type-errors/unit/UnionTypeDuplicateVariants1.txt
deleted file mode 100644
index 7372641..0000000
--- a/dhall/tests/type-errors/unit/UnionTypeDuplicateVariants1.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: UnionTypeDuplicateField
- --> <current file>:1:0
-  |
-1 | <x | x>
-  | ^^^^^^^ UnionTypeDuplicateField
-  |
diff --git a/dhall/tests/type-errors/unit/UnionTypeDuplicateVariants2.txt b/dhall/tests/type-errors/unit/UnionTypeDuplicateVariants2.txt
deleted file mode 100644
index 07042c2..0000000
--- a/dhall/tests/type-errors/unit/UnionTypeDuplicateVariants2.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: UnionTypeDuplicateField
- --> <current file>:1:0
-  |
-1 | <x | x: Natural>
-  | ^^^^^^^^^^^^^^^^ UnionTypeDuplicateField
-  |
diff --git a/dhall/tests/type-errors/unit/UnionTypeMixedKinds.txt b/dhall/tests/type-errors/unit/UnionTypeMixedKinds.txt
deleted file mode 100644
index 00e24b3..0000000
--- a/dhall/tests/type-errors/unit/UnionTypeMixedKinds.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: InvalidFieldType
- --> <current file>:1:0
-  |
-1 | < x : Bool | y : Type >
-  | ^^^^^^^^^^^^^^^^^^^^^^^ InvalidFieldType
-  |
diff --git a/dhall/tests/type-errors/unit/UnionTypeMixedKinds2.txt b/dhall/tests/type-errors/unit/UnionTypeMixedKinds2.txt
deleted file mode 100644
index 924b1e1..0000000
--- a/dhall/tests/type-errors/unit/UnionTypeMixedKinds2.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: InvalidFieldType
- --> <current file>:1:0
-  |
-1 | < x : Kind | y : Type >
-  | ^^^^^^^^^^^^^^^^^^^^^^^ InvalidFieldType
-  |
diff --git a/dhall/tests/type-errors/unit/UnionTypeMixedKinds3.txt b/dhall/tests/type-errors/unit/UnionTypeMixedKinds3.txt
deleted file mode 100644
index 1113a0d..0000000
--- a/dhall/tests/type-errors/unit/UnionTypeMixedKinds3.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: InvalidFieldType
- --> <current file>:1:0
-  |
-1 | < x : Kind | y : Bool >
-  | ^^^^^^^^^^^^^^^^^^^^^^^ InvalidFieldType
-  |
diff --git a/dhall/tests/type-errors/unit/UnionTypeNotType.txt b/dhall/tests/type-errors/unit/UnionTypeNotType.txt
deleted file mode 100644
index b2c06e0..0000000
--- a/dhall/tests/type-errors/unit/UnionTypeNotType.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: InvalidFieldType
- --> <current file>:1:0
-  |
-1 | < x : True >
-  | ^^^^^^^^^^^^ InvalidFieldType
-  |
diff --git a/dhall/tests/type-errors/unit/VariableFree.txt b/dhall/tests/type-errors/unit/VariableFree.txt
deleted file mode 100644
index db78e15..0000000
--- a/dhall/tests/type-errors/unit/VariableFree.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Type error: error: unbound variable `x`
- --> <current file>:1:0
-  |
-1 | x
-  | ^ not found in this scope
-  |