diff --git a/tests/src/main/scala/org/dhallj/tests/acceptance/AcceptanceSuccessSuite.scala b/tests/src/main/scala/org/dhallj/tests/acceptance/AcceptanceSuccessSuite.scala
index b8afe718..b674bbf5 100644
--- a/tests/src/main/scala/org/dhallj/tests/acceptance/AcceptanceSuccessSuite.scala
+++ b/tests/src/main/scala/org/dhallj/tests/acceptance/AcceptanceSuccessSuite.scala
@@ -96,10 +96,15 @@ abstract class ExprOperationAcceptanceSuite(transformation: Expr => Expr) extend
   def compare(result: Expr, expected: Expr): Boolean = result.sameStructure(expected) && result.equivalent(expected)
 }
 
-class CachingTypeCheckingSuite(val base: String) extends ExprOperationAcceptanceSuite(Expr.Util.typeCheck(_)) with CachedResolvingInput
-class TypeCheckingSuite(val base: String) extends ExprOperationAcceptanceSuite(Expr.Util.typeCheck(_)) with ResolvingInput
+class CachingTypeCheckingSuite(val base: String)
+    extends ExprOperationAcceptanceSuite(Expr.Util.typeCheck(_))
+    with CachedResolvingInput
+class TypeCheckingSuite(val base: String)
+    extends ExprOperationAcceptanceSuite(Expr.Util.typeCheck(_))
+    with ResolvingInput
 class AlphaNormalizationSuite(val base: String) extends ExprOperationAcceptanceSuite(_.alphaNormalize) with ParsingInput
 class NormalizationSuite(val base: String) extends ExprOperationAcceptanceSuite(_.normalize) with CachedResolvingInput
+class NormalizationUSuite(val base: String) extends ExprOperationAcceptanceSuite(_.normalize) with ParsingInput
 
 class HashingSuite(val base: String) extends SuccessSuite[Expr, String] with ResolvingInput {
   def makeExpectedPath(inputPath: String): String = inputPath.dropRight(7) + "B.hash"
@@ -117,7 +122,9 @@ class ParsingSuite(val base: String) extends SuccessSuite[Expr, Array[Byte]] wit
   def compare(result: Array[Byte], expected: Array[Byte]): Boolean = result.sameElements(expected)
 }
 
-abstract class ExprDecodingAcceptanceSuite(transformation: Expr => Expr) extends SuccessSuite[Expr, Expr] with ParsingInput {
+abstract class ExprDecodingAcceptanceSuite(transformation: Expr => Expr)
+    extends SuccessSuite[Expr, Expr]
+    with ParsingInput {
   def makeExpectedPath(inputPath: String): String = inputPath.dropRight(8) + "B.dhall"
 
   override def isInputFileName(fileName: String): Boolean = fileName.endsWith("A.dhallb")
diff --git a/tests/src/main/scala/org/dhallj/tests/acceptance/ImportResolutionSuite.scala b/tests/src/main/scala/org/dhallj/tests/acceptance/ImportResolutionSuite.scala
index 680907b3..be4d4743 100644
--- a/tests/src/main/scala/org/dhallj/tests/acceptance/ImportResolutionSuite.scala
+++ b/tests/src/main/scala/org/dhallj/tests/acceptance/ImportResolutionSuite.scala
@@ -17,7 +17,9 @@ import org.http4s.client.blaze._
 import scala.concurrent.ExecutionContext.global
 import scala.io.Source
 
-class ImportResolutionSuite(val base: String) extends ExprOperationAcceptanceSuite(_.normalize) with CachedResolvingInput {
+class ImportResolutionSuite(val base: String)
+    extends ExprOperationAcceptanceSuite(_.normalize)
+    with CachedResolvingInput {
 
   setEnv("DHALL_TEST_VAR", "6 * 7") //Yes, this is SUPER hacky but the JVM doesn't really support setting env vars
 
diff --git a/tests/src/test/scala/org/dhallj/tests/acceptance/AcceptanceSuites.scala b/tests/src/test/scala/org/dhallj/tests/acceptance/AcceptanceSuites.scala
index cef02c3d..486c7e16 100644
--- a/tests/src/test/scala/org/dhallj/tests/acceptance/AcceptanceSuites.scala
+++ b/tests/src/test/scala/org/dhallj/tests/acceptance/AcceptanceSuites.scala
@@ -1,8 +1,8 @@
 package org.dhallj.tests.acceptance
 
-class NormalizationSimpleSuite extends NormalizationSuite("normalization/success/simple")
+class NormalizationSimpleSuite extends NormalizationUSuite("normalization/success/simple")
 class NormalizationRegressionSuite extends NormalizationSuite("normalization/success/regression")
-class NormalizationUnitSuite extends NormalizationSuite("normalization/success/unit")
+class NormalizationUnitSuite extends NormalizationUSuite("normalization/success/unit")
 class NormalizationSimplificationsSuite extends NormalizationSuite("normalization/success/simplifications")
 class NormalizationOtherSuite extends NormalizationSuite("normalization/success")
 class NormalizationHTAccessSuite extends NormalizationSuite("normalization/success/haskell-tutorial/access")
@@ -45,7 +45,6 @@ class BinaryDecodingFailureUnitSuite extends BinaryDecodingFailureSuite("binary-
 class ImportResolutionSuccessSuite extends ImportResolutionSuite("import/success")
 class ImportResolutionSuccessUnitSuite extends ImportResolutionSuite("import/success/unit") {
   //Normalize uses a relative path which isn't compatible with our current method of reading classpath resources
-  //Alternative type error - open question on semantics
   override def ignored = Set("Normalize")
 }
 class ImportResolutionSuccessUnitAsLocationSuite extends ImportResolutionSuite("import/success/unit/asLocation") {