diff --git a/build.sbt b/build.sbt
index 8fc2342f05f6c61d275d6e09c90a22e272329ffe..36a1e4879f8a2e01abf14e32bcfa72bcd8e19dc5 100644
--- a/build.sbt
+++ b/build.sbt
@@ -93,50 +93,29 @@ sourcesInBase in Compile := false
 
 Keys.fork in run := true
 
-// Unit Tests
-Keys.fork in Test := true
-
-logBuffered in Test := false
-
-javaOptions in Test ++= Seq("-Xss16M", "-Xmx4G", "-XX:MaxPermSize=128M")
-
-parallelExecution in Test := true
-
-testOptions in Test := Seq(Tests.Argument("-oDF"))
-
+lazy val testSettings = Seq(
+    Keys.fork := true,
+    logBuffered := false,
+    javaOptions ++= Seq("-Xss16M", "-Xmx4G", "-XX:MaxPermSize=128M")
+)
 
+// Unit Tests
+testOptions in Test := Seq(Tests.Argument("-oDF"), Tests.Filter(_ startsWith "leon.unit."))
 
-// Regression Tests
+// Integration Tests
 lazy val IntegrTest = config("integration") extend(Test)
 
-Keys.fork in IntegrTest := true
-
-logBuffered in IntegrTest := false
-
-javaOptions in IntegrTest ++= Seq("-Xss16M", "-Xmx4G", "-XX:MaxPermSize=128M")
-
-parallelExecution in IntegrTest := false
-
-testOptions in IntegrTest := Seq(Tests.Argument("-oDF"))
+testOptions in IntegrTest := Seq(Tests.Argument("-oDF"), Tests.Filter(_ startsWith "leon.integration."))
 
 
 
 // RegressionTest Tests
 lazy val RegressionTest = config("regression") extend(Test)
 
-Keys.fork in RegressionTest := true
-
-logBuffered in RegressionTest := false
-
-javaOptions in RegressionTest  ++= Seq("-Xss16M", "-Xmx4G", "-XX:MaxPermSize=128M")
+testOptions in RegressionTest  := Seq(Tests.Argument("-oDF"), Tests.Filter(_ startsWith "leon.regression."))
 
 parallelExecution in RegressionTest := false
 
-testOptions in RegressionTest  := Seq(Tests.Argument("-oDF"))
-
-
-
-
 
 def ghProject(repo: String, version: String) = RootProject(uri(s"${repo}#${version}"))
 
@@ -148,7 +127,7 @@ lazy val root = (project in file(".")).
   configs(RegressionTest).
   configs(IntegrTest).
   dependsOn(bonsai, scalaSmtLib).
-  settings(inConfig(RegressionTest)(Defaults.testSettings): _*).
-  settings(inConfig(IntegrTest)(Defaults.testSettings): _*)
+  settings(inConfig(RegressionTest)(Defaults.testTasks ++ testSettings): _*).
+  settings(inConfig(IntegrTest)(Defaults.testTasks ++ testSettings): _*)
 
 
diff --git a/src/integration/scala/leon/integration/TestSilentReporter.scala b/src/integration/scala/leon/integration/TestSilentReporter.scala
deleted file mode 100644
index 6c639f74ac9fb7a5c8ec0c7387e7b8ec13173220..0000000000000000000000000000000000000000
--- a/src/integration/scala/leon/integration/TestSilentReporter.scala
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
-
-package leon.integration
-
-import leon.DefaultReporter
-
-class TestSilentReporter extends DefaultReporter(Set()) {
-  var lastErrors: List[String] = Nil
-
-  override def emit(msg: Message): Unit = msg match { 
-    case Message(this.ERROR, _, msg) => lastErrors ++= List(msg.toString)
-    case Message(this.FATAL, _, msg) => lastErrors ++= List(msg.toString)
-    case _ =>
-  }
-}
diff --git a/src/integration/scala/leon/integration/helpers/ExpressionsDSL.scala b/src/integration/scala/leon/integration/helpers/ExpressionsDSL.scala
deleted file mode 100644
index 5725bd7c1e85db8e20dcdbd56bb058ba531f7b13..0000000000000000000000000000000000000000
--- a/src/integration/scala/leon/integration/helpers/ExpressionsDSL.scala
+++ /dev/null
@@ -1,72 +0,0 @@
-package leon.integration.helpers
-
-import org.scalatest.Assertions
-
-import leon.purescala.Definitions._
-import leon.purescala.Common._
-import leon.purescala.Types._
-import leon.purescala.Expressions._
-
-trait ExpressionsDSL {
-  self: Assertions =>
-
-  val F = BooleanLiteral(false)
-  val T = BooleanLiteral(true)
-
-  def bi(x: Int)    = InfiniteIntegerLiteral(x)
-  def b(x: Boolean) = BooleanLiteral(x)
-  def i(x: Int)     = IntLiteral(x)
-  def r(x: Double)  = RealLiteral(BigDecimal(x))
-
-  val a = FreshIdentifier("a", Int32Type).toVariable
-  val b = FreshIdentifier("b", Int32Type).toVariable
-  val c = FreshIdentifier("c", Int32Type).toVariable
-
-  val x = FreshIdentifier("x", IntegerType).toVariable
-  val y = FreshIdentifier("y", IntegerType).toVariable
-  val z = FreshIdentifier("z", IntegerType).toVariable
-
-  val m = FreshIdentifier("m", RealType).toVariable
-  val n = FreshIdentifier("n", RealType).toVariable
-  val o = FreshIdentifier("o", RealType).toVariable
-
-  val p = FreshIdentifier("p", BooleanType).toVariable
-  val q = FreshIdentifier("q", BooleanType).toVariable
-  val r = FreshIdentifier("r", BooleanType).toVariable
-
-
-  def funDef(name: String)(implicit pgm: Program): FunDef = {
-    pgm.lookupAll(name).collect {
-      case fd: FunDef => fd
-    }.headOption.getOrElse {
-      fail(s"Failed to lookup function '$name' in program")
-    }
-  }
-
-  def classDef(name: String)(implicit pgm: Program): ClassDef = {
-    pgm.lookupAll(name).collect {
-      case cd: ClassDef => cd
-    }.headOption.getOrElse {
-      fail(s"Failed to lookup class '$name' in program")
-    }
-  }
-
-  def caseClassDef(name: String)(implicit pgm: Program): CaseClassDef = {
-    pgm.lookupAll(name).collect {
-      case ccd: CaseClassDef => ccd
-    }.headOption.getOrElse {
-      fail(s"Failed to lookup case class '$name' in program")
-    }
-  }
-
-  def cc(name: String)(args: Expr*)(implicit pgm: Program): Expr = {
-    val cct = caseClassDef(name).typed(Seq())
-    CaseClass(cct, args.toSeq)
-  }
-
-  def fcall(name: String)(args: Expr*)(implicit pgm: Program): Expr = {
-    val tfd = funDef(name).typed(Seq())
-    FunctionInvocation(tfd, args.toSeq)
-  }
-
-}
diff --git a/src/integration/scala/leon/integration/helpers/WithLikelyEq.scala b/src/integration/scala/leon/integration/helpers/WithLikelyEq.scala
deleted file mode 100644
index 7425bba66fa0c29c2076f508805b4c14222d40db..0000000000000000000000000000000000000000
--- a/src/integration/scala/leon/integration/helpers/WithLikelyEq.scala
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
-
-package leon.integration.helpers
-
-import org.scalatest.Assertions
-
-import leon.test._
-import leon.evaluators._
-import leon.purescala.Common._
-import leon.LeonContext
-import leon.purescala.Types._
-import leon.purescala.Definitions._
-import leon.purescala.ExprOps._
-import leon.purescala.Expressions._
-import leon.utils.SeqUtils._
-
-/*
- * Determine if two expressions over arithmetic variables are likely to be equal.
- *
- * This is a probabilistic based approach, it does not rely on any external solver and can
- * only prove the non equality of two expressions.
- */
-trait WithLikelyEq {
-  self: Assertions =>
-
-  val typesValues = Map[TypeTree, Seq[Expr]](
-    IntegerType -> Seq(-42, -1, 0, 1, 7, 42).map(InfiniteIntegerLiteral(_)),
-    Int32Type   -> Seq(-42, -1, 0, 1, 7, 42).map(IntLiteral(_)),
-    BooleanType -> Seq(BooleanLiteral(false), BooleanLiteral(true))
-  )
-
-  def checkLikelyEq(ctx: LeonContext, pgm: Program = Program.empty)(e1: Expr, e2: Expr, pre: Option[Expr] = None, values: Map[Identifier, Expr] = Map()): Unit = {
-    val evaluator = new DefaultEvaluator(ctx, pgm)
-
-    val freeVars = (variablesOf(e1) ++ variablesOf(e2)).toSeq.sortBy(_.globalId)
-
-    if (freeVars.isEmpty) {
-      val r1 = evaluator.eval(e1)
-      val r2 = evaluator.eval(e2)
-
-      assert(r1 === r2, s"'$e1' != '$e2' ('$r1' != '$r2')")
-    } else {
-
-      val allValues = freeVars.map(id => values.get(id).map(Seq(_)).getOrElse(typesValues(id.getType)))
-
-      cartesianProduct(allValues).foreach { vs =>
-        val m = (freeVars zip vs).toMap
-
-        val doTest = pre.map { p =>
-          evaluator.eval(p, m).result match {
-            case Some(BooleanLiteral(b)) => b
-            case _ => fail("Precondition is not a boolean expression")
-          }
-        }.getOrElse(true)
-
-        if (doTest) {
-          val r1 = evaluator.eval(e1, m)
-          val r2 = evaluator.eval(e2, m)
-
-          assert(r1 === r2, s"'$e1' != '$e2' with '$m' ('$r1' != '$r2')")
-        }
-      }
-    }
-  }
-}
diff --git a/src/regression/scala/leon/regression/TestSilentReporter.scala b/src/regression/scala/leon/regression/TestSilentReporter.scala
deleted file mode 100644
index e774c419d95063d3ff14dcb3f3cd0a66e14dca3c..0000000000000000000000000000000000000000
--- a/src/regression/scala/leon/regression/TestSilentReporter.scala
+++ /dev/null
@@ -1,15 +0,0 @@
-/* Copyright 2009-2015 EPFL, Lausanne */
-
-package leon.regression
-
-import leon.DefaultReporter
-
-class TestSilentReporter extends DefaultReporter(Set()) {
-  var lastErrors: List[String] = Nil
-
-  override def emit(msg: Message): Unit = msg match { 
-    case Message(this.ERROR, _, msg) => lastErrors ++= List(msg.toString)
-    case Message(this.FATAL, _, msg) => lastErrors ++= List(msg.toString)
-    case _ =>
-  }
-}
diff --git a/src/regression/resources/regression/frontends/error/simple/Asserts.scala b/src/test/resources/regression/frontends/error/simple/Asserts.scala
similarity index 100%
rename from src/regression/resources/regression/frontends/error/simple/Asserts.scala
rename to src/test/resources/regression/frontends/error/simple/Asserts.scala
diff --git a/src/regression/resources/regression/frontends/error/simple/ConvertBigInt.scala b/src/test/resources/regression/frontends/error/simple/ConvertBigInt.scala
similarity index 100%
rename from src/regression/resources/regression/frontends/error/simple/ConvertBigInt.scala
rename to src/test/resources/regression/frontends/error/simple/ConvertBigInt.scala
diff --git a/src/regression/resources/regression/frontends/error/simple/InstanceOf1.scala b/src/test/resources/regression/frontends/error/simple/InstanceOf1.scala
similarity index 100%
rename from src/regression/resources/regression/frontends/error/simple/InstanceOf1.scala
rename to src/test/resources/regression/frontends/error/simple/InstanceOf1.scala
diff --git a/src/regression/resources/regression/frontends/error/simple/LiteralBigInt.scala b/src/test/resources/regression/frontends/error/simple/LiteralBigInt.scala
similarity index 100%
rename from src/regression/resources/regression/frontends/error/simple/LiteralBigInt.scala
rename to src/test/resources/regression/frontends/error/simple/LiteralBigInt.scala
diff --git a/src/regression/resources/regression/frontends/error/simple/NotEquals.scala b/src/test/resources/regression/frontends/error/simple/NotEquals.scala
similarity index 100%
rename from src/regression/resources/regression/frontends/error/simple/NotEquals.scala
rename to src/test/resources/regression/frontends/error/simple/NotEquals.scala
diff --git a/src/regression/resources/regression/frontends/error/xlang/Array1.scala b/src/test/resources/regression/frontends/error/xlang/Array1.scala
similarity index 100%
rename from src/regression/resources/regression/frontends/error/xlang/Array1.scala
rename to src/test/resources/regression/frontends/error/xlang/Array1.scala
diff --git a/src/regression/resources/regression/frontends/error/xlang/Array10.scala b/src/test/resources/regression/frontends/error/xlang/Array10.scala
similarity index 100%
rename from src/regression/resources/regression/frontends/error/xlang/Array10.scala
rename to src/test/resources/regression/frontends/error/xlang/Array10.scala
diff --git a/src/regression/resources/regression/frontends/error/xlang/Array2.scala b/src/test/resources/regression/frontends/error/xlang/Array2.scala
similarity index 100%
rename from src/regression/resources/regression/frontends/error/xlang/Array2.scala
rename to src/test/resources/regression/frontends/error/xlang/Array2.scala
diff --git a/src/regression/resources/regression/frontends/error/xlang/Array3.scala b/src/test/resources/regression/frontends/error/xlang/Array3.scala
similarity index 100%
rename from src/regression/resources/regression/frontends/error/xlang/Array3.scala
rename to src/test/resources/regression/frontends/error/xlang/Array3.scala
diff --git a/src/regression/resources/regression/frontends/error/xlang/Array4.scala b/src/test/resources/regression/frontends/error/xlang/Array4.scala
similarity index 100%
rename from src/regression/resources/regression/frontends/error/xlang/Array4.scala
rename to src/test/resources/regression/frontends/error/xlang/Array4.scala
diff --git a/src/regression/resources/regression/frontends/error/xlang/Array5.scala b/src/test/resources/regression/frontends/error/xlang/Array5.scala
similarity index 100%
rename from src/regression/resources/regression/frontends/error/xlang/Array5.scala
rename to src/test/resources/regression/frontends/error/xlang/Array5.scala
diff --git a/src/regression/resources/regression/frontends/error/xlang/Array6.scala b/src/test/resources/regression/frontends/error/xlang/Array6.scala
similarity index 100%
rename from src/regression/resources/regression/frontends/error/xlang/Array6.scala
rename to src/test/resources/regression/frontends/error/xlang/Array6.scala
diff --git a/src/regression/resources/regression/frontends/error/xlang/Array7.scala b/src/test/resources/regression/frontends/error/xlang/Array7.scala
similarity index 100%
rename from src/regression/resources/regression/frontends/error/xlang/Array7.scala
rename to src/test/resources/regression/frontends/error/xlang/Array7.scala
diff --git a/src/regression/resources/regression/frontends/error/xlang/Array8.scala b/src/test/resources/regression/frontends/error/xlang/Array8.scala
similarity index 100%
rename from src/regression/resources/regression/frontends/error/xlang/Array8.scala
rename to src/test/resources/regression/frontends/error/xlang/Array8.scala
diff --git a/src/regression/resources/regression/frontends/error/xlang/Array9.scala b/src/test/resources/regression/frontends/error/xlang/Array9.scala
similarity index 100%
rename from src/regression/resources/regression/frontends/error/xlang/Array9.scala
rename to src/test/resources/regression/frontends/error/xlang/Array9.scala
diff --git a/src/regression/resources/regression/frontends/passing/ClassFields.scala b/src/test/resources/regression/frontends/passing/ClassFields.scala
similarity index 100%
rename from src/regression/resources/regression/frontends/passing/ClassFields.scala
rename to src/test/resources/regression/frontends/passing/ClassFields.scala
diff --git a/src/regression/resources/regression/frontends/passing/Fields.scala b/src/test/resources/regression/frontends/passing/Fields.scala
similarity index 100%
rename from src/regression/resources/regression/frontends/passing/Fields.scala
rename to src/test/resources/regression/frontends/passing/Fields.scala
diff --git a/src/regression/resources/regression/frontends/passing/ImplicitDefs.scala b/src/test/resources/regression/frontends/passing/ImplicitDefs.scala
similarity index 100%
rename from src/regression/resources/regression/frontends/passing/ImplicitDefs.scala
rename to src/test/resources/regression/frontends/passing/ImplicitDefs.scala
diff --git a/src/regression/resources/regression/frontends/passing/ImplicitDefs2.scala b/src/test/resources/regression/frontends/passing/ImplicitDefs2.scala
similarity index 100%
rename from src/regression/resources/regression/frontends/passing/ImplicitDefs2.scala
rename to src/test/resources/regression/frontends/passing/ImplicitDefs2.scala
diff --git a/src/regression/resources/regression/frontends/passing/Operators.scala b/src/test/resources/regression/frontends/passing/Operators.scala
similarity index 100%
rename from src/regression/resources/regression/frontends/passing/Operators.scala
rename to src/test/resources/regression/frontends/passing/Operators.scala
diff --git a/src/regression/resources/regression/frontends/passing/OptParams.scala b/src/test/resources/regression/frontends/passing/OptParams.scala
similarity index 100%
rename from src/regression/resources/regression/frontends/passing/OptParams.scala
rename to src/test/resources/regression/frontends/passing/OptParams.scala
diff --git a/src/regression/resources/regression/frontends/passing/Overrides.scala b/src/test/resources/regression/frontends/passing/Overrides.scala
similarity index 100%
rename from src/regression/resources/regression/frontends/passing/Overrides.scala
rename to src/test/resources/regression/frontends/passing/Overrides.scala
diff --git a/src/regression/resources/regression/frontends/passing/bigintExtr.scala b/src/test/resources/regression/frontends/passing/bigintExtr.scala
similarity index 100%
rename from src/regression/resources/regression/frontends/passing/bigintExtr.scala
rename to src/test/resources/regression/frontends/passing/bigintExtr.scala
diff --git a/src/regression/resources/regression/performance/cegis/Add.scala b/src/test/resources/regression/performance/cegis/Add.scala
similarity index 100%
rename from src/regression/resources/regression/performance/cegis/Add.scala
rename to src/test/resources/regression/performance/cegis/Add.scala
diff --git a/src/regression/resources/regression/performance/cegis/Distinct.scala b/src/test/resources/regression/performance/cegis/Distinct.scala
similarity index 100%
rename from src/regression/resources/regression/performance/cegis/Distinct.scala
rename to src/test/resources/regression/performance/cegis/Distinct.scala
diff --git a/src/regression/resources/regression/performance/cegis/Hole1.scala b/src/test/resources/regression/performance/cegis/Hole1.scala
similarity index 100%
rename from src/regression/resources/regression/performance/cegis/Hole1.scala
rename to src/test/resources/regression/performance/cegis/Hole1.scala
diff --git a/src/regression/resources/regression/performance/cegis/Length.scala b/src/test/resources/regression/performance/cegis/Length.scala
similarity index 100%
rename from src/regression/resources/regression/performance/cegis/Length.scala
rename to src/test/resources/regression/performance/cegis/Length.scala
diff --git a/src/regression/resources/regression/performance/cegis/Mult.scala b/src/test/resources/regression/performance/cegis/Mult.scala
similarity index 100%
rename from src/regression/resources/regression/performance/cegis/Mult.scala
rename to src/test/resources/regression/performance/cegis/Mult.scala
diff --git a/src/regression/resources/regression/performance/cegis/Squared.scala b/src/test/resources/regression/performance/cegis/Squared.scala
similarity index 100%
rename from src/regression/resources/regression/performance/cegis/Squared.scala
rename to src/test/resources/regression/performance/cegis/Squared.scala
diff --git a/src/regression/resources/regression/repair/Compiler1.scala b/src/test/resources/regression/repair/Compiler1.scala
similarity index 100%
rename from src/regression/resources/regression/repair/Compiler1.scala
rename to src/test/resources/regression/repair/Compiler1.scala
diff --git a/src/regression/resources/regression/repair/Heap4.scala b/src/test/resources/regression/repair/Heap4.scala
similarity index 100%
rename from src/regression/resources/regression/repair/Heap4.scala
rename to src/test/resources/regression/repair/Heap4.scala
diff --git a/src/regression/resources/regression/repair/List1.scala b/src/test/resources/regression/repair/List1.scala
similarity index 100%
rename from src/regression/resources/regression/repair/List1.scala
rename to src/test/resources/regression/repair/List1.scala
diff --git a/src/regression/resources/regression/repair/ListEasy.scala b/src/test/resources/regression/repair/ListEasy.scala
similarity index 100%
rename from src/regression/resources/regression/repair/ListEasy.scala
rename to src/test/resources/regression/repair/ListEasy.scala
diff --git a/src/regression/resources/regression/repair/MergeSort2.scala b/src/test/resources/regression/repair/MergeSort2.scala
similarity index 100%
rename from src/regression/resources/regression/repair/MergeSort2.scala
rename to src/test/resources/regression/repair/MergeSort2.scala
diff --git a/src/regression/resources/regression/synthesis/Church/Add.scala b/src/test/resources/regression/synthesis/Church/Add.scala
similarity index 100%
rename from src/regression/resources/regression/synthesis/Church/Add.scala
rename to src/test/resources/regression/synthesis/Church/Add.scala
diff --git a/src/regression/resources/regression/synthesis/Church/Distinct.scala b/src/test/resources/regression/synthesis/Church/Distinct.scala
similarity index 100%
rename from src/regression/resources/regression/synthesis/Church/Distinct.scala
rename to src/test/resources/regression/synthesis/Church/Distinct.scala
diff --git a/src/regression/resources/regression/synthesis/Church/Mult.scala b/src/test/resources/regression/synthesis/Church/Mult.scala
similarity index 100%
rename from src/regression/resources/regression/synthesis/Church/Mult.scala
rename to src/test/resources/regression/synthesis/Church/Mult.scala
diff --git a/src/regression/resources/regression/synthesis/Church/Squared.scala b/src/test/resources/regression/synthesis/Church/Squared.scala
similarity index 100%
rename from src/regression/resources/regression/synthesis/Church/Squared.scala
rename to src/test/resources/regression/synthesis/Church/Squared.scala
diff --git a/src/regression/resources/regression/synthesis/Examples/Length.scala b/src/test/resources/regression/synthesis/Examples/Length.scala
similarity index 100%
rename from src/regression/resources/regression/synthesis/Examples/Length.scala
rename to src/test/resources/regression/synthesis/Examples/Length.scala
diff --git a/src/regression/resources/regression/synthesis/Holes/Hole1.scala b/src/test/resources/regression/synthesis/Holes/Hole1.scala
similarity index 100%
rename from src/regression/resources/regression/synthesis/Holes/Hole1.scala
rename to src/test/resources/regression/synthesis/Holes/Hole1.scala
diff --git a/src/regression/resources/regression/synthesis/List/Delete.scala b/src/test/resources/regression/synthesis/List/Delete.scala
similarity index 100%
rename from src/regression/resources/regression/synthesis/List/Delete.scala
rename to src/test/resources/regression/synthesis/List/Delete.scala
diff --git a/src/regression/resources/regression/synthesis/List/Diff.scala b/src/test/resources/regression/synthesis/List/Diff.scala
similarity index 100%
rename from src/regression/resources/regression/synthesis/List/Diff.scala
rename to src/test/resources/regression/synthesis/List/Diff.scala
diff --git a/src/regression/resources/regression/synthesis/List/Insert.scala b/src/test/resources/regression/synthesis/List/Insert.scala
similarity index 100%
rename from src/regression/resources/regression/synthesis/List/Insert.scala
rename to src/test/resources/regression/synthesis/List/Insert.scala
diff --git a/src/regression/resources/regression/synthesis/List/Split1.scala b/src/test/resources/regression/synthesis/List/Split1.scala
similarity index 100%
rename from src/regression/resources/regression/synthesis/List/Split1.scala
rename to src/test/resources/regression/synthesis/List/Split1.scala
diff --git a/src/regression/resources/regression/synthesis/List/Split2.scala b/src/test/resources/regression/synthesis/List/Split2.scala
similarity index 100%
rename from src/regression/resources/regression/synthesis/List/Split2.scala
rename to src/test/resources/regression/synthesis/List/Split2.scala
diff --git a/src/regression/resources/regression/synthesis/List/Split3.scala b/src/test/resources/regression/synthesis/List/Split3.scala
similarity index 100%
rename from src/regression/resources/regression/synthesis/List/Split3.scala
rename to src/test/resources/regression/synthesis/List/Split3.scala
diff --git a/src/regression/resources/regression/synthesis/List/Union.scala b/src/test/resources/regression/synthesis/List/Union.scala
similarity index 100%
rename from src/regression/resources/regression/synthesis/List/Union.scala
rename to src/test/resources/regression/synthesis/List/Union.scala
diff --git a/src/regression/resources/regression/synthesis/Misc/HolesBug.scala b/src/test/resources/regression/synthesis/Misc/HolesBug.scala
similarity index 100%
rename from src/regression/resources/regression/synthesis/Misc/HolesBug.scala
rename to src/test/resources/regression/synthesis/Misc/HolesBug.scala
diff --git a/src/regression/resources/regression/synthesis/Misc/Unapply.scala b/src/test/resources/regression/synthesis/Misc/Unapply.scala
similarity index 100%
rename from src/regression/resources/regression/synthesis/Misc/Unapply.scala
rename to src/test/resources/regression/synthesis/Misc/Unapply.scala
diff --git a/src/regression/resources/regression/synthesis/SortedList/Delete.scala b/src/test/resources/regression/synthesis/SortedList/Delete.scala
similarity index 100%
rename from src/regression/resources/regression/synthesis/SortedList/Delete.scala
rename to src/test/resources/regression/synthesis/SortedList/Delete.scala
diff --git a/src/regression/resources/regression/synthesis/SortedList/Diff.scala b/src/test/resources/regression/synthesis/SortedList/Diff.scala
similarity index 100%
rename from src/regression/resources/regression/synthesis/SortedList/Diff.scala
rename to src/test/resources/regression/synthesis/SortedList/Diff.scala
diff --git a/src/regression/resources/regression/synthesis/SortedList/Insert1.scala b/src/test/resources/regression/synthesis/SortedList/Insert1.scala
similarity index 100%
rename from src/regression/resources/regression/synthesis/SortedList/Insert1.scala
rename to src/test/resources/regression/synthesis/SortedList/Insert1.scala
diff --git a/src/regression/resources/regression/synthesis/SortedList/Insert2.scala b/src/test/resources/regression/synthesis/SortedList/Insert2.scala
similarity index 100%
rename from src/regression/resources/regression/synthesis/SortedList/Insert2.scala
rename to src/test/resources/regression/synthesis/SortedList/Insert2.scala
diff --git a/src/regression/resources/regression/synthesis/SortedList/InsertSort.scala b/src/test/resources/regression/synthesis/SortedList/InsertSort.scala
similarity index 100%
rename from src/regression/resources/regression/synthesis/SortedList/InsertSort.scala
rename to src/test/resources/regression/synthesis/SortedList/InsertSort.scala
diff --git a/src/regression/resources/regression/synthesis/SortedList/Union.scala b/src/test/resources/regression/synthesis/SortedList/Union.scala
similarity index 100%
rename from src/regression/resources/regression/synthesis/SortedList/Union.scala
rename to src/test/resources/regression/synthesis/SortedList/Union.scala
diff --git a/src/regression/resources/regression/synthesis/StrictSortedList/Delete.scala b/src/test/resources/regression/synthesis/StrictSortedList/Delete.scala
similarity index 100%
rename from src/regression/resources/regression/synthesis/StrictSortedList/Delete.scala
rename to src/test/resources/regression/synthesis/StrictSortedList/Delete.scala
diff --git a/src/regression/resources/regression/synthesis/StrictSortedList/Insert.scala b/src/test/resources/regression/synthesis/StrictSortedList/Insert.scala
similarity index 100%
rename from src/regression/resources/regression/synthesis/StrictSortedList/Insert.scala
rename to src/test/resources/regression/synthesis/StrictSortedList/Insert.scala
diff --git a/src/regression/resources/regression/synthesis/StrictSortedList/Union.scala b/src/test/resources/regression/synthesis/StrictSortedList/Union.scala
similarity index 100%
rename from src/regression/resources/regression/synthesis/StrictSortedList/Union.scala
rename to src/test/resources/regression/synthesis/StrictSortedList/Union.scala
diff --git a/src/regression/resources/regression/termination/looping/LambdaCalculus.scala b/src/test/resources/regression/termination/looping/LambdaCalculus.scala
similarity index 100%
rename from src/regression/resources/regression/termination/looping/LambdaCalculus.scala
rename to src/test/resources/regression/termination/looping/LambdaCalculus.scala
diff --git a/src/regression/resources/regression/termination/looping/Numeric1.scala b/src/test/resources/regression/termination/looping/Numeric1.scala
similarity index 100%
rename from src/regression/resources/regression/termination/looping/Numeric1.scala
rename to src/test/resources/regression/termination/looping/Numeric1.scala
diff --git a/src/regression/resources/regression/termination/looping/Numeric2.scala b/src/test/resources/regression/termination/looping/Numeric2.scala
similarity index 100%
rename from src/regression/resources/regression/termination/looping/Numeric2.scala
rename to src/test/resources/regression/termination/looping/Numeric2.scala
diff --git a/src/regression/resources/regression/termination/looping/Numeric3.scala b/src/test/resources/regression/termination/looping/Numeric3.scala
similarity index 100%
rename from src/regression/resources/regression/termination/looping/Numeric3.scala
rename to src/test/resources/regression/termination/looping/Numeric3.scala
diff --git a/src/regression/resources/regression/termination/looping/OddEven.scala b/src/test/resources/regression/termination/looping/OddEven.scala
similarity index 100%
rename from src/regression/resources/regression/termination/looping/OddEven.scala
rename to src/test/resources/regression/termination/looping/OddEven.scala
diff --git a/src/regression/resources/regression/termination/looping/Queue.scala b/src/test/resources/regression/termination/looping/Queue.scala
similarity index 100%
rename from src/regression/resources/regression/termination/looping/Queue.scala
rename to src/test/resources/regression/termination/looping/Queue.scala
diff --git a/src/regression/resources/regression/termination/looping/Termination_failling1.scala b/src/test/resources/regression/termination/looping/Termination_failling1.scala
similarity index 100%
rename from src/regression/resources/regression/termination/looping/Termination_failling1.scala
rename to src/test/resources/regression/termination/looping/Termination_failling1.scala
diff --git a/src/regression/resources/regression/termination/looping/UniversalEquality.scala b/src/test/resources/regression/termination/looping/UniversalEquality.scala
similarity index 100%
rename from src/regression/resources/regression/termination/looping/UniversalEquality.scala
rename to src/test/resources/regression/termination/looping/UniversalEquality.scala
diff --git a/src/regression/resources/regression/termination/looping/WrongFibonacci.scala b/src/test/resources/regression/termination/looping/WrongFibonacci.scala
similarity index 100%
rename from src/regression/resources/regression/termination/looping/WrongFibonacci.scala
rename to src/test/resources/regression/termination/looping/WrongFibonacci.scala
diff --git a/src/regression/resources/regression/termination/valid/BinaryTreeImp.scala b/src/test/resources/regression/termination/valid/BinaryTreeImp.scala
similarity index 100%
rename from src/regression/resources/regression/termination/valid/BinaryTreeImp.scala
rename to src/test/resources/regression/termination/valid/BinaryTreeImp.scala
diff --git a/src/regression/resources/regression/termination/valid/CountTowardsZero.scala b/src/test/resources/regression/termination/valid/CountTowardsZero.scala
similarity index 100%
rename from src/regression/resources/regression/termination/valid/CountTowardsZero.scala
rename to src/test/resources/regression/termination/valid/CountTowardsZero.scala
diff --git a/src/regression/resources/regression/termination/valid/Fibonacci.scala b/src/test/resources/regression/termination/valid/Fibonacci.scala
similarity index 100%
rename from src/regression/resources/regression/termination/valid/Fibonacci.scala
rename to src/test/resources/regression/termination/valid/Fibonacci.scala
diff --git a/src/regression/resources/regression/termination/valid/HOTermination.scala b/src/test/resources/regression/termination/valid/HOTermination.scala
similarity index 100%
rename from src/regression/resources/regression/termination/valid/HOTermination.scala
rename to src/test/resources/regression/termination/valid/HOTermination.scala
diff --git a/src/regression/resources/regression/termination/valid/ListWithSize.scala b/src/test/resources/regression/termination/valid/ListWithSize.scala
similarity index 100%
rename from src/regression/resources/regression/termination/valid/ListWithSize.scala
rename to src/test/resources/regression/termination/valid/ListWithSize.scala
diff --git a/src/regression/resources/regression/termination/valid/Numeric1.scala b/src/test/resources/regression/termination/valid/Numeric1.scala
similarity index 100%
rename from src/regression/resources/regression/termination/valid/Numeric1.scala
rename to src/test/resources/regression/termination/valid/Numeric1.scala
diff --git a/src/regression/resources/regression/termination/valid/Queue.scala b/src/test/resources/regression/termination/valid/Queue.scala
similarity index 100%
rename from src/regression/resources/regression/termination/valid/Queue.scala
rename to src/test/resources/regression/termination/valid/Queue.scala
diff --git a/src/regression/resources/regression/termination/valid/QuickSort.scala b/src/test/resources/regression/termination/valid/QuickSort.scala
similarity index 100%
rename from src/regression/resources/regression/termination/valid/QuickSort.scala
rename to src/test/resources/regression/termination/valid/QuickSort.scala
diff --git a/src/regression/resources/regression/termination/valid/RedBlackTree.scala b/src/test/resources/regression/termination/valid/RedBlackTree.scala
similarity index 100%
rename from src/regression/resources/regression/termination/valid/RedBlackTree.scala
rename to src/test/resources/regression/termination/valid/RedBlackTree.scala
diff --git a/src/regression/resources/regression/termination/valid/SimpInterpret.scala b/src/test/resources/regression/termination/valid/SimpInterpret.scala
similarity index 100%
rename from src/regression/resources/regression/termination/valid/SimpInterpret.scala
rename to src/test/resources/regression/termination/valid/SimpInterpret.scala
diff --git a/src/regression/resources/regression/termination/valid/Termination_passing1.scala b/src/test/resources/regression/termination/valid/Termination_passing1.scala
similarity index 100%
rename from src/regression/resources/regression/termination/valid/Termination_passing1.scala
rename to src/test/resources/regression/termination/valid/Termination_passing1.scala
diff --git a/src/regression/resources/regression/testcases b/src/test/resources/regression/testcases
similarity index 100%
rename from src/regression/resources/regression/testcases
rename to src/test/resources/regression/testcases
diff --git a/src/regression/resources/regression/transformations/SimplifyLets.scala b/src/test/resources/regression/transformations/SimplifyLets.scala
similarity index 100%
rename from src/regression/resources/regression/transformations/SimplifyLets.scala
rename to src/test/resources/regression/transformations/SimplifyLets.scala
diff --git a/src/regression/resources/regression/transformations/SimplifyPaths.scala b/src/test/resources/regression/transformations/SimplifyPaths.scala
similarity index 100%
rename from src/regression/resources/regression/transformations/SimplifyPaths.scala
rename to src/test/resources/regression/transformations/SimplifyPaths.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/invalid/Acc.scala b/src/test/resources/regression/verification/newsolvers/invalid/Acc.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/invalid/Acc.scala
rename to src/test/resources/regression/verification/newsolvers/invalid/Acc.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/invalid/AddingNegativeNumbers.scala b/src/test/resources/regression/verification/newsolvers/invalid/AddingNegativeNumbers.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/invalid/AddingNegativeNumbers.scala
rename to src/test/resources/regression/verification/newsolvers/invalid/AddingNegativeNumbers.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/invalid/AddingPositiveNumbers.scala b/src/test/resources/regression/verification/newsolvers/invalid/AddingPositiveNumbers.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/invalid/AddingPositiveNumbers.scala
rename to src/test/resources/regression/verification/newsolvers/invalid/AddingPositiveNumbers.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/invalid/Array1.scala b/src/test/resources/regression/verification/newsolvers/invalid/Array1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/invalid/Array1.scala
rename to src/test/resources/regression/verification/newsolvers/invalid/Array1.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/invalid/Array2.scala b/src/test/resources/regression/verification/newsolvers/invalid/Array2.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/invalid/Array2.scala
rename to src/test/resources/regression/verification/newsolvers/invalid/Array2.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/invalid/Array3.scala b/src/test/resources/regression/verification/newsolvers/invalid/Array3.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/invalid/Array3.scala
rename to src/test/resources/regression/verification/newsolvers/invalid/Array3.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/invalid/Array4.scala b/src/test/resources/regression/verification/newsolvers/invalid/Array4.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/invalid/Array4.scala
rename to src/test/resources/regression/verification/newsolvers/invalid/Array4.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/invalid/Asserts1.scala b/src/test/resources/regression/verification/newsolvers/invalid/Asserts1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/invalid/Asserts1.scala
rename to src/test/resources/regression/verification/newsolvers/invalid/Asserts1.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/invalid/BVDivision.scala b/src/test/resources/regression/verification/newsolvers/invalid/BVDivision.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/invalid/BVDivision.scala
rename to src/test/resources/regression/verification/newsolvers/invalid/BVDivision.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/invalid/BVDivision2.scala b/src/test/resources/regression/verification/newsolvers/invalid/BVDivision2.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/invalid/BVDivision2.scala
rename to src/test/resources/regression/verification/newsolvers/invalid/BVDivision2.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/invalid/BigArray.scala b/src/test/resources/regression/verification/newsolvers/invalid/BigArray.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/invalid/BigArray.scala
rename to src/test/resources/regression/verification/newsolvers/invalid/BigArray.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/invalid/Division.scala b/src/test/resources/regression/verification/newsolvers/invalid/Division.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/invalid/Division.scala
rename to src/test/resources/regression/verification/newsolvers/invalid/Division.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/invalid/EnsuringBoolean.scala b/src/test/resources/regression/verification/newsolvers/invalid/EnsuringBoolean.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/invalid/EnsuringBoolean.scala
rename to src/test/resources/regression/verification/newsolvers/invalid/EnsuringBoolean.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/invalid/FiniteSort.scala b/src/test/resources/regression/verification/newsolvers/invalid/FiniteSort.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/invalid/FiniteSort.scala
rename to src/test/resources/regression/verification/newsolvers/invalid/FiniteSort.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/invalid/Generics.scala b/src/test/resources/regression/verification/newsolvers/invalid/Generics.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/invalid/Generics.scala
rename to src/test/resources/regression/verification/newsolvers/invalid/Generics.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/invalid/Generics2.scala b/src/test/resources/regression/verification/newsolvers/invalid/Generics2.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/invalid/Generics2.scala
rename to src/test/resources/regression/verification/newsolvers/invalid/Generics2.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/invalid/InsertionSort.scala b/src/test/resources/regression/verification/newsolvers/invalid/InsertionSort.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/invalid/InsertionSort.scala
rename to src/test/resources/regression/verification/newsolvers/invalid/InsertionSort.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/invalid/ListOperations.scala b/src/test/resources/regression/verification/newsolvers/invalid/ListOperations.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/invalid/ListOperations.scala
rename to src/test/resources/regression/verification/newsolvers/invalid/ListOperations.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/invalid/MyTuple1.scala b/src/test/resources/regression/verification/newsolvers/invalid/MyTuple1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/invalid/MyTuple1.scala
rename to src/test/resources/regression/verification/newsolvers/invalid/MyTuple1.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/invalid/MyTuple2.scala b/src/test/resources/regression/verification/newsolvers/invalid/MyTuple2.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/invalid/MyTuple2.scala
rename to src/test/resources/regression/verification/newsolvers/invalid/MyTuple2.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/invalid/MyTuple3.scala b/src/test/resources/regression/verification/newsolvers/invalid/MyTuple3.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/invalid/MyTuple3.scala
rename to src/test/resources/regression/verification/newsolvers/invalid/MyTuple3.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/invalid/PositiveMap.scala b/src/test/resources/regression/verification/newsolvers/invalid/PositiveMap.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/invalid/PositiveMap.scala
rename to src/test/resources/regression/verification/newsolvers/invalid/PositiveMap.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/invalid/PropositionalLogic.scala b/src/test/resources/regression/verification/newsolvers/invalid/PropositionalLogic.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/invalid/PropositionalLogic.scala
rename to src/test/resources/regression/verification/newsolvers/invalid/PropositionalLogic.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/invalid/README b/src/test/resources/regression/verification/newsolvers/invalid/README
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/invalid/README
rename to src/test/resources/regression/verification/newsolvers/invalid/README
diff --git a/src/regression/resources/regression/verification/newsolvers/invalid/RedBlackTree.scala b/src/test/resources/regression/verification/newsolvers/invalid/RedBlackTree.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/invalid/RedBlackTree.scala
rename to src/test/resources/regression/verification/newsolvers/invalid/RedBlackTree.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/invalid/Unit1.scala b/src/test/resources/regression/verification/newsolvers/invalid/Unit1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/invalid/Unit1.scala
rename to src/test/resources/regression/verification/newsolvers/invalid/Unit1.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/Acc.scala b/src/test/resources/regression/verification/newsolvers/valid/Acc.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/Acc.scala
rename to src/test/resources/regression/verification/newsolvers/valid/Acc.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/AddingPositiveNumbers.scala b/src/test/resources/regression/verification/newsolvers/valid/AddingPositiveNumbers.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/AddingPositiveNumbers.scala
rename to src/test/resources/regression/verification/newsolvers/valid/AddingPositiveNumbers.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/AmortizedQueue.scala b/src/test/resources/regression/verification/newsolvers/valid/AmortizedQueue.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/AmortizedQueue.scala
rename to src/test/resources/regression/verification/newsolvers/valid/AmortizedQueue.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/ArrayLiterals.scala b/src/test/resources/regression/verification/newsolvers/valid/ArrayLiterals.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/ArrayLiterals.scala
rename to src/test/resources/regression/verification/newsolvers/valid/ArrayLiterals.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/ArrayUpdated.scala b/src/test/resources/regression/verification/newsolvers/valid/ArrayUpdated.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/ArrayUpdated.scala
rename to src/test/resources/regression/verification/newsolvers/valid/ArrayUpdated.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/Asserts1.scala b/src/test/resources/regression/verification/newsolvers/valid/Asserts1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/Asserts1.scala
rename to src/test/resources/regression/verification/newsolvers/valid/Asserts1.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/AssociativeList.scala b/src/test/resources/regression/verification/newsolvers/valid/AssociativeList.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/AssociativeList.scala
rename to src/test/resources/regression/verification/newsolvers/valid/AssociativeList.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/BestRealTypes.scala b/src/test/resources/regression/verification/newsolvers/valid/BestRealTypes.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/BestRealTypes.scala
rename to src/test/resources/regression/verification/newsolvers/valid/BestRealTypes.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/BitsTricks.scala b/src/test/resources/regression/verification/newsolvers/valid/BitsTricks.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/BitsTricks.scala
rename to src/test/resources/regression/verification/newsolvers/valid/BitsTricks.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/CaseObject1.scala b/src/test/resources/regression/verification/newsolvers/valid/CaseObject1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/CaseObject1.scala
rename to src/test/resources/regression/verification/newsolvers/valid/CaseObject1.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/Field1.scala b/src/test/resources/regression/verification/newsolvers/valid/Field1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/Field1.scala
rename to src/test/resources/regression/verification/newsolvers/valid/Field1.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/Field2.scala b/src/test/resources/regression/verification/newsolvers/valid/Field2.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/Field2.scala
rename to src/test/resources/regression/verification/newsolvers/valid/Field2.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/FiniteSort.scala b/src/test/resources/regression/verification/newsolvers/valid/FiniteSort.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/FiniteSort.scala
rename to src/test/resources/regression/verification/newsolvers/valid/FiniteSort.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/FoolProofAdder.scala b/src/test/resources/regression/verification/newsolvers/valid/FoolProofAdder.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/FoolProofAdder.scala
rename to src/test/resources/regression/verification/newsolvers/valid/FoolProofAdder.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/Generics.scala b/src/test/resources/regression/verification/newsolvers/valid/Generics.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/Generics.scala
rename to src/test/resources/regression/verification/newsolvers/valid/Generics.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/Generics1.scala b/src/test/resources/regression/verification/newsolvers/valid/Generics1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/Generics1.scala
rename to src/test/resources/regression/verification/newsolvers/valid/Generics1.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/Heaps.scala b/src/test/resources/regression/verification/newsolvers/valid/Heaps.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/Heaps.scala
rename to src/test/resources/regression/verification/newsolvers/valid/Heaps.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/InsertionSort.scala b/src/test/resources/regression/verification/newsolvers/valid/InsertionSort.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/InsertionSort.scala
rename to src/test/resources/regression/verification/newsolvers/valid/InsertionSort.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/InstanceOf1.scala b/src/test/resources/regression/verification/newsolvers/valid/InstanceOf1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/InstanceOf1.scala
rename to src/test/resources/regression/verification/newsolvers/valid/InstanceOf1.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/ListOperations.scala b/src/test/resources/regression/verification/newsolvers/valid/ListOperations.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/ListOperations.scala
rename to src/test/resources/regression/verification/newsolvers/valid/ListOperations.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/LiteralMaps.scala b/src/test/resources/regression/verification/newsolvers/valid/LiteralMaps.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/LiteralMaps.scala
rename to src/test/resources/regression/verification/newsolvers/valid/LiteralMaps.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/MergeSort.scala b/src/test/resources/regression/verification/newsolvers/valid/MergeSort.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/MergeSort.scala
rename to src/test/resources/regression/verification/newsolvers/valid/MergeSort.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/MyMap.scala b/src/test/resources/regression/verification/newsolvers/valid/MyMap.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/MyMap.scala
rename to src/test/resources/regression/verification/newsolvers/valid/MyMap.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/MySet.scala b/src/test/resources/regression/verification/newsolvers/valid/MySet.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/MySet.scala
rename to src/test/resources/regression/verification/newsolvers/valid/MySet.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/MyTuple1.scala b/src/test/resources/regression/verification/newsolvers/valid/MyTuple1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/MyTuple1.scala
rename to src/test/resources/regression/verification/newsolvers/valid/MyTuple1.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/MyTuple2.scala b/src/test/resources/regression/verification/newsolvers/valid/MyTuple2.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/MyTuple2.scala
rename to src/test/resources/regression/verification/newsolvers/valid/MyTuple2.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/MyTuple3.scala b/src/test/resources/regression/verification/newsolvers/valid/MyTuple3.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/MyTuple3.scala
rename to src/test/resources/regression/verification/newsolvers/valid/MyTuple3.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/MyTuple4.scala b/src/test/resources/regression/verification/newsolvers/valid/MyTuple4.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/MyTuple4.scala
rename to src/test/resources/regression/verification/newsolvers/valid/MyTuple4.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/MyTuple5.scala b/src/test/resources/regression/verification/newsolvers/valid/MyTuple5.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/MyTuple5.scala
rename to src/test/resources/regression/verification/newsolvers/valid/MyTuple5.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/MyTuple6.scala b/src/test/resources/regression/verification/newsolvers/valid/MyTuple6.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/MyTuple6.scala
rename to src/test/resources/regression/verification/newsolvers/valid/MyTuple6.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/Nat.scala b/src/test/resources/regression/verification/newsolvers/valid/Nat.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/Nat.scala
rename to src/test/resources/regression/verification/newsolvers/valid/Nat.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/NotEquals.scala b/src/test/resources/regression/verification/newsolvers/valid/NotEquals.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/NotEquals.scala
rename to src/test/resources/regression/verification/newsolvers/valid/NotEquals.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/PositiveMap.scala b/src/test/resources/regression/verification/newsolvers/valid/PositiveMap.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/PositiveMap.scala
rename to src/test/resources/regression/verification/newsolvers/valid/PositiveMap.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/PropositionalLogic.scala b/src/test/resources/regression/verification/newsolvers/valid/PropositionalLogic.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/PropositionalLogic.scala
rename to src/test/resources/regression/verification/newsolvers/valid/PropositionalLogic.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/README b/src/test/resources/regression/verification/newsolvers/valid/README
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/README
rename to src/test/resources/regression/verification/newsolvers/valid/README
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/RedBlackTree.scala b/src/test/resources/regression/verification/newsolvers/valid/RedBlackTree.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/RedBlackTree.scala
rename to src/test/resources/regression/verification/newsolvers/valid/RedBlackTree.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/SearchLinkedList.scala b/src/test/resources/regression/verification/newsolvers/valid/SearchLinkedList.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/SearchLinkedList.scala
rename to src/test/resources/regression/verification/newsolvers/valid/SearchLinkedList.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/Subtyping1.scala b/src/test/resources/regression/verification/newsolvers/valid/Subtyping1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/Subtyping1.scala
rename to src/test/resources/regression/verification/newsolvers/valid/Subtyping1.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/Subtyping2.scala b/src/test/resources/regression/verification/newsolvers/valid/Subtyping2.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/Subtyping2.scala
rename to src/test/resources/regression/verification/newsolvers/valid/Subtyping2.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/Unit1.scala b/src/test/resources/regression/verification/newsolvers/valid/Unit1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/Unit1.scala
rename to src/test/resources/regression/verification/newsolvers/valid/Unit1.scala
diff --git a/src/regression/resources/regression/verification/newsolvers/valid/Unit2.scala b/src/test/resources/regression/verification/newsolvers/valid/Unit2.scala
similarity index 100%
rename from src/regression/resources/regression/verification/newsolvers/valid/Unit2.scala
rename to src/test/resources/regression/verification/newsolvers/valid/Unit2.scala
diff --git a/src/regression/resources/regression/verification/purescala/invalid/Acc.scala b/src/test/resources/regression/verification/purescala/invalid/Acc.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/Acc.scala
rename to src/test/resources/regression/verification/purescala/invalid/Acc.scala
diff --git a/src/regression/resources/regression/verification/purescala/invalid/AddingNegativeNumbers.scala b/src/test/resources/regression/verification/purescala/invalid/AddingNegativeNumbers.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/AddingNegativeNumbers.scala
rename to src/test/resources/regression/verification/purescala/invalid/AddingNegativeNumbers.scala
diff --git a/src/regression/resources/regression/verification/purescala/invalid/AddingPositiveNumbers.scala b/src/test/resources/regression/verification/purescala/invalid/AddingPositiveNumbers.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/AddingPositiveNumbers.scala
rename to src/test/resources/regression/verification/purescala/invalid/AddingPositiveNumbers.scala
diff --git a/src/regression/resources/regression/verification/purescala/invalid/Array1.scala b/src/test/resources/regression/verification/purescala/invalid/Array1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/Array1.scala
rename to src/test/resources/regression/verification/purescala/invalid/Array1.scala
diff --git a/src/regression/resources/regression/verification/purescala/invalid/Array2.scala b/src/test/resources/regression/verification/purescala/invalid/Array2.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/Array2.scala
rename to src/test/resources/regression/verification/purescala/invalid/Array2.scala
diff --git a/src/regression/resources/regression/verification/purescala/invalid/Array3.scala b/src/test/resources/regression/verification/purescala/invalid/Array3.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/Array3.scala
rename to src/test/resources/regression/verification/purescala/invalid/Array3.scala
diff --git a/src/regression/resources/regression/verification/purescala/invalid/Array4.scala b/src/test/resources/regression/verification/purescala/invalid/Array4.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/Array4.scala
rename to src/test/resources/regression/verification/purescala/invalid/Array4.scala
diff --git a/src/regression/resources/regression/verification/purescala/invalid/Asserts1.scala b/src/test/resources/regression/verification/purescala/invalid/Asserts1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/Asserts1.scala
rename to src/test/resources/regression/verification/purescala/invalid/Asserts1.scala
diff --git a/src/regression/resources/regression/verification/purescala/invalid/BVDivision2.scala b/src/test/resources/regression/verification/purescala/invalid/BVDivision2.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/BVDivision2.scala
rename to src/test/resources/regression/verification/purescala/invalid/BVDivision2.scala
diff --git a/src/regression/resources/regression/verification/purescala/invalid/BVDivisionByZero.scala b/src/test/resources/regression/verification/purescala/invalid/BVDivisionByZero.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/BVDivisionByZero.scala
rename to src/test/resources/regression/verification/purescala/invalid/BVDivisionByZero.scala
diff --git a/src/regression/resources/regression/verification/purescala/invalid/BVRemainderByZero.scala b/src/test/resources/regression/verification/purescala/invalid/BVRemainderByZero.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/BVRemainderByZero.scala
rename to src/test/resources/regression/verification/purescala/invalid/BVRemainderByZero.scala
diff --git a/src/regression/resources/regression/verification/purescala/invalid/BigArray.scala b/src/test/resources/regression/verification/purescala/invalid/BigArray.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/BigArray.scala
rename to src/test/resources/regression/verification/purescala/invalid/BigArray.scala
diff --git a/src/regression/resources/regression/verification/purescala/invalid/BraunTree.scala b/src/test/resources/regression/verification/purescala/invalid/BraunTree.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/BraunTree.scala
rename to src/test/resources/regression/verification/purescala/invalid/BraunTree.scala
diff --git a/src/regression/resources/regression/verification/purescala/invalid/CharCompare.scala b/src/test/resources/regression/verification/purescala/invalid/CharCompare.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/CharCompare.scala
rename to src/test/resources/regression/verification/purescala/invalid/CharCompare.scala
diff --git a/src/regression/resources/regression/verification/purescala/invalid/Choose1.scala b/src/test/resources/regression/verification/purescala/invalid/Choose1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/Choose1.scala
rename to src/test/resources/regression/verification/purescala/invalid/Choose1.scala
diff --git a/src/regression/resources/regression/verification/purescala/invalid/DivisionByZero.scala b/src/test/resources/regression/verification/purescala/invalid/DivisionByZero.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/DivisionByZero.scala
rename to src/test/resources/regression/verification/purescala/invalid/DivisionByZero.scala
diff --git a/src/regression/resources/regression/verification/purescala/invalid/EnsuringBoolean.scala b/src/test/resources/regression/verification/purescala/invalid/EnsuringBoolean.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/EnsuringBoolean.scala
rename to src/test/resources/regression/verification/purescala/invalid/EnsuringBoolean.scala
diff --git a/src/regression/resources/regression/verification/purescala/invalid/FiniteSort.scala b/src/test/resources/regression/verification/purescala/invalid/FiniteSort.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/FiniteSort.scala
rename to src/test/resources/regression/verification/purescala/invalid/FiniteSort.scala
diff --git a/src/regression/resources/regression/verification/purescala/invalid/Generics.scala b/src/test/resources/regression/verification/purescala/invalid/Generics.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/Generics.scala
rename to src/test/resources/regression/verification/purescala/invalid/Generics.scala
diff --git a/src/regression/resources/regression/verification/purescala/invalid/Generics2.scala b/src/test/resources/regression/verification/purescala/invalid/Generics2.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/Generics2.scala
rename to src/test/resources/regression/verification/purescala/invalid/Generics2.scala
diff --git a/src/regression/resources/regression/verification/purescala/invalid/HOInvocations.scala b/src/test/resources/regression/verification/purescala/invalid/HOInvocations.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/HOInvocations.scala
rename to src/test/resources/regression/verification/purescala/invalid/HOInvocations.scala
diff --git a/src/regression/resources/regression/verification/purescala/invalid/InsertionSort.scala b/src/test/resources/regression/verification/purescala/invalid/InsertionSort.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/InsertionSort.scala
rename to src/test/resources/regression/verification/purescala/invalid/InsertionSort.scala
diff --git a/src/regression/resources/regression/verification/purescala/invalid/ListOperations.scala b/src/test/resources/regression/verification/purescala/invalid/ListOperations.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/ListOperations.scala
rename to src/test/resources/regression/verification/purescala/invalid/ListOperations.scala
diff --git a/src/regression/resources/regression/verification/purescala/invalid/Lists.scala b/src/test/resources/regression/verification/purescala/invalid/Lists.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/Lists.scala
rename to src/test/resources/regression/verification/purescala/invalid/Lists.scala
diff --git a/src/regression/resources/regression/verification/purescala/invalid/MatchExh.scala b/src/test/resources/regression/verification/purescala/invalid/MatchExh.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/MatchExh.scala
rename to src/test/resources/regression/verification/purescala/invalid/MatchExh.scala
diff --git a/src/regression/resources/regression/verification/purescala/invalid/ModuloByZero.scala b/src/test/resources/regression/verification/purescala/invalid/ModuloByZero.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/ModuloByZero.scala
rename to src/test/resources/regression/verification/purescala/invalid/ModuloByZero.scala
diff --git a/src/regression/resources/regression/verification/purescala/invalid/MyTuple1.scala b/src/test/resources/regression/verification/purescala/invalid/MyTuple1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/MyTuple1.scala
rename to src/test/resources/regression/verification/purescala/invalid/MyTuple1.scala
diff --git a/src/regression/resources/regression/verification/purescala/invalid/MyTuple2.scala b/src/test/resources/regression/verification/purescala/invalid/MyTuple2.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/MyTuple2.scala
rename to src/test/resources/regression/verification/purescala/invalid/MyTuple2.scala
diff --git a/src/regression/resources/regression/verification/purescala/invalid/MyTuple3.scala b/src/test/resources/regression/verification/purescala/invalid/MyTuple3.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/MyTuple3.scala
rename to src/test/resources/regression/verification/purescala/invalid/MyTuple3.scala
diff --git a/src/regression/resources/regression/verification/purescala/invalid/Overrides.scala b/src/test/resources/regression/verification/purescala/invalid/Overrides.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/Overrides.scala
rename to src/test/resources/regression/verification/purescala/invalid/Overrides.scala
diff --git a/src/regression/resources/regression/verification/purescala/invalid/PositiveMap.scala b/src/test/resources/regression/verification/purescala/invalid/PositiveMap.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/PositiveMap.scala
rename to src/test/resources/regression/verification/purescala/invalid/PositiveMap.scala
diff --git a/src/regression/resources/regression/verification/purescala/invalid/PropositionalLogic.scala b/src/test/resources/regression/verification/purescala/invalid/PropositionalLogic.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/PropositionalLogic.scala
rename to src/test/resources/regression/verification/purescala/invalid/PropositionalLogic.scala
diff --git a/src/regression/resources/regression/verification/purescala/invalid/README b/src/test/resources/regression/verification/purescala/invalid/README
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/README
rename to src/test/resources/regression/verification/purescala/invalid/README
diff --git a/src/regression/resources/regression/verification/purescala/invalid/RealDivisionByZero.scala b/src/test/resources/regression/verification/purescala/invalid/RealDivisionByZero.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/RealDivisionByZero.scala
rename to src/test/resources/regression/verification/purescala/invalid/RealDivisionByZero.scala
diff --git a/src/regression/resources/regression/verification/purescala/invalid/RealNonDiscrete.scala b/src/test/resources/regression/verification/purescala/invalid/RealNonDiscrete.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/RealNonDiscrete.scala
rename to src/test/resources/regression/verification/purescala/invalid/RealNonDiscrete.scala
diff --git a/src/regression/resources/regression/verification/purescala/invalid/RedBlackTree.scala b/src/test/resources/regression/verification/purescala/invalid/RedBlackTree.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/RedBlackTree.scala
rename to src/test/resources/regression/verification/purescala/invalid/RedBlackTree.scala
diff --git a/src/regression/resources/regression/verification/purescala/invalid/RemainderByZero.scala b/src/test/resources/regression/verification/purescala/invalid/RemainderByZero.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/RemainderByZero.scala
rename to src/test/resources/regression/verification/purescala/invalid/RemainderByZero.scala
diff --git a/src/regression/resources/regression/verification/purescala/invalid/Unapply1.scala b/src/test/resources/regression/verification/purescala/invalid/Unapply1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/Unapply1.scala
rename to src/test/resources/regression/verification/purescala/invalid/Unapply1.scala
diff --git a/src/regression/resources/regression/verification/purescala/invalid/Unapply2.scala b/src/test/resources/regression/verification/purescala/invalid/Unapply2.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/Unapply2.scala
rename to src/test/resources/regression/verification/purescala/invalid/Unapply2.scala
diff --git a/src/regression/resources/regression/verification/purescala/invalid/Unit1.scala b/src/test/resources/regression/verification/purescala/invalid/Unit1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/invalid/Unit1.scala
rename to src/test/resources/regression/verification/purescala/invalid/Unit1.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/Acc.scala b/src/test/resources/regression/verification/purescala/valid/Acc.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/Acc.scala
rename to src/test/resources/regression/verification/purescala/valid/Acc.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/AddingPositiveNumbers.scala b/src/test/resources/regression/verification/purescala/valid/AddingPositiveNumbers.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/AddingPositiveNumbers.scala
rename to src/test/resources/regression/verification/purescala/valid/AddingPositiveNumbers.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/AmortizedQueue.scala b/src/test/resources/regression/verification/purescala/valid/AmortizedQueue.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/AmortizedQueue.scala
rename to src/test/resources/regression/verification/purescala/valid/AmortizedQueue.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/Anonymous.scala b/src/test/resources/regression/verification/purescala/valid/Anonymous.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/Anonymous.scala
rename to src/test/resources/regression/verification/purescala/valid/Anonymous.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/ArrayLiterals.scala b/src/test/resources/regression/verification/purescala/valid/ArrayLiterals.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/ArrayLiterals.scala
rename to src/test/resources/regression/verification/purescala/valid/ArrayLiterals.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/ArrayUpdated.scala b/src/test/resources/regression/verification/purescala/valid/ArrayUpdated.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/ArrayUpdated.scala
rename to src/test/resources/regression/verification/purescala/valid/ArrayUpdated.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/Asserts1.scala b/src/test/resources/regression/verification/purescala/valid/Asserts1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/Asserts1.scala
rename to src/test/resources/regression/verification/purescala/valid/Asserts1.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/AssociativeList.scala b/src/test/resources/regression/verification/purescala/valid/AssociativeList.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/AssociativeList.scala
rename to src/test/resources/regression/verification/purescala/valid/AssociativeList.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/BVDivSemantics.scala b/src/test/resources/regression/verification/purescala/valid/BVDivSemantics.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/BVDivSemantics.scala
rename to src/test/resources/regression/verification/purescala/valid/BVDivSemantics.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/BVDivisionByZero.scala b/src/test/resources/regression/verification/purescala/valid/BVDivisionByZero.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/BVDivisionByZero.scala
rename to src/test/resources/regression/verification/purescala/valid/BVDivisionByZero.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/BVDivisionByZero2.scala b/src/test/resources/regression/verification/purescala/valid/BVDivisionByZero2.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/BVDivisionByZero2.scala
rename to src/test/resources/regression/verification/purescala/valid/BVDivisionByZero2.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/BasicReal.scala b/src/test/resources/regression/verification/purescala/valid/BasicReal.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/BasicReal.scala
rename to src/test/resources/regression/verification/purescala/valid/BasicReal.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/BestRealTypes.scala b/src/test/resources/regression/verification/purescala/valid/BestRealTypes.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/BestRealTypes.scala
rename to src/test/resources/regression/verification/purescala/valid/BestRealTypes.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/BitsTricks.scala b/src/test/resources/regression/verification/purescala/valid/BitsTricks.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/BitsTricks.scala
rename to src/test/resources/regression/verification/purescala/valid/BitsTricks.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/CaseObject1.scala b/src/test/resources/regression/verification/purescala/valid/CaseObject1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/CaseObject1.scala
rename to src/test/resources/regression/verification/purescala/valid/CaseObject1.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/Choose1.scala b/src/test/resources/regression/verification/purescala/valid/Choose1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/Choose1.scala
rename to src/test/resources/regression/verification/purescala/valid/Choose1.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/Closures.scala b/src/test/resources/regression/verification/purescala/valid/Closures.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/Closures.scala
rename to src/test/resources/regression/verification/purescala/valid/Closures.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/Closures2.scala b/src/test/resources/regression/verification/purescala/valid/Closures2.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/Closures2.scala
rename to src/test/resources/regression/verification/purescala/valid/Closures2.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/DivisionByZero.scala b/src/test/resources/regression/verification/purescala/valid/DivisionByZero.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/DivisionByZero.scala
rename to src/test/resources/regression/verification/purescala/valid/DivisionByZero.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/Extern1.scala b/src/test/resources/regression/verification/purescala/valid/Extern1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/Extern1.scala
rename to src/test/resources/regression/verification/purescala/valid/Extern1.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/Extern2.scala b/src/test/resources/regression/verification/purescala/valid/Extern2.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/Extern2.scala
rename to src/test/resources/regression/verification/purescala/valid/Extern2.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/Field1.scala b/src/test/resources/regression/verification/purescala/valid/Field1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/Field1.scala
rename to src/test/resources/regression/verification/purescala/valid/Field1.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/Field2.scala b/src/test/resources/regression/verification/purescala/valid/Field2.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/Field2.scala
rename to src/test/resources/regression/verification/purescala/valid/Field2.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/FiniteSort.scala b/src/test/resources/regression/verification/purescala/valid/FiniteSort.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/FiniteSort.scala
rename to src/test/resources/regression/verification/purescala/valid/FiniteSort.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/FlatMap.scala b/src/test/resources/regression/verification/purescala/valid/FlatMap.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/FlatMap.scala
rename to src/test/resources/regression/verification/purescala/valid/FlatMap.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/FoldAssociative.scala b/src/test/resources/regression/verification/purescala/valid/FoldAssociative.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/FoldAssociative.scala
rename to src/test/resources/regression/verification/purescala/valid/FoldAssociative.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/FoolProofAdder.scala b/src/test/resources/regression/verification/purescala/valid/FoolProofAdder.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/FoolProofAdder.scala
rename to src/test/resources/regression/verification/purescala/valid/FoolProofAdder.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/Generics.scala b/src/test/resources/regression/verification/purescala/valid/Generics.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/Generics.scala
rename to src/test/resources/regression/verification/purescala/valid/Generics.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/Generics1.scala b/src/test/resources/regression/verification/purescala/valid/Generics1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/Generics1.scala
rename to src/test/resources/regression/verification/purescala/valid/Generics1.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/HOInvocations.scala b/src/test/resources/regression/verification/purescala/valid/HOInvocations.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/HOInvocations.scala
rename to src/test/resources/regression/verification/purescala/valid/HOInvocations.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/Heaps.scala b/src/test/resources/regression/verification/purescala/valid/Heaps.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/Heaps.scala
rename to src/test/resources/regression/verification/purescala/valid/Heaps.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/InsertionSort.scala b/src/test/resources/regression/verification/purescala/valid/InsertionSort.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/InsertionSort.scala
rename to src/test/resources/regression/verification/purescala/valid/InsertionSort.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/InstanceOf1.scala b/src/test/resources/regression/verification/purescala/valid/InstanceOf1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/InstanceOf1.scala
rename to src/test/resources/regression/verification/purescala/valid/InstanceOf1.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/Justify.scala b/src/test/resources/regression/verification/purescala/valid/Justify.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/Justify.scala
rename to src/test/resources/regression/verification/purescala/valid/Justify.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/LambdaEquality.scala b/src/test/resources/regression/verification/purescala/valid/LambdaEquality.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/LambdaEquality.scala
rename to src/test/resources/regression/verification/purescala/valid/LambdaEquality.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/Lambdas.scala b/src/test/resources/regression/verification/purescala/valid/Lambdas.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/Lambdas.scala
rename to src/test/resources/regression/verification/purescala/valid/Lambdas.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/ListOperations.scala b/src/test/resources/regression/verification/purescala/valid/ListOperations.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/ListOperations.scala
rename to src/test/resources/regression/verification/purescala/valid/ListOperations.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/Lists1.scala b/src/test/resources/regression/verification/purescala/valid/Lists1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/Lists1.scala
rename to src/test/resources/regression/verification/purescala/valid/Lists1.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/Lists2.scala b/src/test/resources/regression/verification/purescala/valid/Lists2.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/Lists2.scala
rename to src/test/resources/regression/verification/purescala/valid/Lists2.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/Lists3.scala b/src/test/resources/regression/verification/purescala/valid/Lists3.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/Lists3.scala
rename to src/test/resources/regression/verification/purescala/valid/Lists3.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/Lists4.scala b/src/test/resources/regression/verification/purescala/valid/Lists4.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/Lists4.scala
rename to src/test/resources/regression/verification/purescala/valid/Lists4.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/Lists5.scala b/src/test/resources/regression/verification/purescala/valid/Lists5.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/Lists5.scala
rename to src/test/resources/regression/verification/purescala/valid/Lists5.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/Lists6.scala b/src/test/resources/regression/verification/purescala/valid/Lists6.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/Lists6.scala
rename to src/test/resources/regression/verification/purescala/valid/Lists6.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/LiteralMaps.scala b/src/test/resources/regression/verification/purescala/valid/LiteralMaps.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/LiteralMaps.scala
rename to src/test/resources/regression/verification/purescala/valid/LiteralMaps.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/MapGetOrElse2.scala b/src/test/resources/regression/verification/purescala/valid/MapGetOrElse2.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/MapGetOrElse2.scala
rename to src/test/resources/regression/verification/purescala/valid/MapGetOrElse2.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/MapGetPlus.scala b/src/test/resources/regression/verification/purescala/valid/MapGetPlus.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/MapGetPlus.scala
rename to src/test/resources/regression/verification/purescala/valid/MapGetPlus.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/MatchExh.scala b/src/test/resources/regression/verification/purescala/valid/MatchExh.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/MatchExh.scala
rename to src/test/resources/regression/verification/purescala/valid/MatchExh.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/MergeSort.scala b/src/test/resources/regression/verification/purescala/valid/MergeSort.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/MergeSort.scala
rename to src/test/resources/regression/verification/purescala/valid/MergeSort.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/Methods.scala b/src/test/resources/regression/verification/purescala/valid/Methods.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/Methods.scala
rename to src/test/resources/regression/verification/purescala/valid/Methods.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/Monads1.scala b/src/test/resources/regression/verification/purescala/valid/Monads1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/Monads1.scala
rename to src/test/resources/regression/verification/purescala/valid/Monads1.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/Monads2.scala b/src/test/resources/regression/verification/purescala/valid/Monads2.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/Monads2.scala
rename to src/test/resources/regression/verification/purescala/valid/Monads2.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/Monads3.scala b/src/test/resources/regression/verification/purescala/valid/Monads3.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/Monads3.scala
rename to src/test/resources/regression/verification/purescala/valid/Monads3.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/MyMap.scala b/src/test/resources/regression/verification/purescala/valid/MyMap.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/MyMap.scala
rename to src/test/resources/regression/verification/purescala/valid/MyMap.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/MySet.scala b/src/test/resources/regression/verification/purescala/valid/MySet.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/MySet.scala
rename to src/test/resources/regression/verification/purescala/valid/MySet.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/MyTuple1.scala b/src/test/resources/regression/verification/purescala/valid/MyTuple1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/MyTuple1.scala
rename to src/test/resources/regression/verification/purescala/valid/MyTuple1.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/MyTuple2.scala b/src/test/resources/regression/verification/purescala/valid/MyTuple2.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/MyTuple2.scala
rename to src/test/resources/regression/verification/purescala/valid/MyTuple2.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/MyTuple3.scala b/src/test/resources/regression/verification/purescala/valid/MyTuple3.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/MyTuple3.scala
rename to src/test/resources/regression/verification/purescala/valid/MyTuple3.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/MyTuple4.scala b/src/test/resources/regression/verification/purescala/valid/MyTuple4.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/MyTuple4.scala
rename to src/test/resources/regression/verification/purescala/valid/MyTuple4.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/MyTuple5.scala b/src/test/resources/regression/verification/purescala/valid/MyTuple5.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/MyTuple5.scala
rename to src/test/resources/regression/verification/purescala/valid/MyTuple5.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/MyTuple6.scala b/src/test/resources/regression/verification/purescala/valid/MyTuple6.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/MyTuple6.scala
rename to src/test/resources/regression/verification/purescala/valid/MyTuple6.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/Nat.scala b/src/test/resources/regression/verification/purescala/valid/Nat.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/Nat.scala
rename to src/test/resources/regression/verification/purescala/valid/Nat.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/NotEquals.scala b/src/test/resources/regression/verification/purescala/valid/NotEquals.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/NotEquals.scala
rename to src/test/resources/regression/verification/purescala/valid/NotEquals.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/Overrides.scala b/src/test/resources/regression/verification/purescala/valid/Overrides.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/Overrides.scala
rename to src/test/resources/regression/verification/purescala/valid/Overrides.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/ParBalance.scala b/src/test/resources/regression/verification/purescala/valid/ParBalance.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/ParBalance.scala
rename to src/test/resources/regression/verification/purescala/valid/ParBalance.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/PositiveMap.scala b/src/test/resources/regression/verification/purescala/valid/PositiveMap.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/PositiveMap.scala
rename to src/test/resources/regression/verification/purescala/valid/PositiveMap.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/PropositionalLogic.scala b/src/test/resources/regression/verification/purescala/valid/PropositionalLogic.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/PropositionalLogic.scala
rename to src/test/resources/regression/verification/purescala/valid/PropositionalLogic.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/README b/src/test/resources/regression/verification/purescala/valid/README
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/README
rename to src/test/resources/regression/verification/purescala/valid/README
diff --git a/src/regression/resources/regression/verification/purescala/valid/RealDivisionByZero.scala b/src/test/resources/regression/verification/purescala/valid/RealDivisionByZero.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/RealDivisionByZero.scala
rename to src/test/resources/regression/verification/purescala/valid/RealDivisionByZero.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/RedBlackTree.scala b/src/test/resources/regression/verification/purescala/valid/RedBlackTree.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/RedBlackTree.scala
rename to src/test/resources/regression/verification/purescala/valid/RedBlackTree.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/SearchLinkedList.scala b/src/test/resources/regression/verification/purescala/valid/SearchLinkedList.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/SearchLinkedList.scala
rename to src/test/resources/regression/verification/purescala/valid/SearchLinkedList.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/Sets1.scala b/src/test/resources/regression/verification/purescala/valid/Sets1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/Sets1.scala
rename to src/test/resources/regression/verification/purescala/valid/Sets1.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/Sets2.scala b/src/test/resources/regression/verification/purescala/valid/Sets2.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/Sets2.scala
rename to src/test/resources/regression/verification/purescala/valid/Sets2.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/Subtyping1.scala b/src/test/resources/regression/verification/purescala/valid/Subtyping1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/Subtyping1.scala
rename to src/test/resources/regression/verification/purescala/valid/Subtyping1.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/Subtyping2.scala b/src/test/resources/regression/verification/purescala/valid/Subtyping2.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/Subtyping2.scala
rename to src/test/resources/regression/verification/purescala/valid/Subtyping2.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/Trees1.scala b/src/test/resources/regression/verification/purescala/valid/Trees1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/Trees1.scala
rename to src/test/resources/regression/verification/purescala/valid/Trees1.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/Unapply.scala b/src/test/resources/regression/verification/purescala/valid/Unapply.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/Unapply.scala
rename to src/test/resources/regression/verification/purescala/valid/Unapply.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/Unit1.scala b/src/test/resources/regression/verification/purescala/valid/Unit1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/Unit1.scala
rename to src/test/resources/regression/verification/purescala/valid/Unit1.scala
diff --git a/src/regression/resources/regression/verification/purescala/valid/Unit2.scala b/src/test/resources/regression/verification/purescala/valid/Unit2.scala
similarity index 100%
rename from src/regression/resources/regression/verification/purescala/valid/Unit2.scala
rename to src/test/resources/regression/verification/purescala/valid/Unit2.scala
diff --git a/src/regression/resources/regression/verification/xlang/invalid/Array1.scala b/src/test/resources/regression/verification/xlang/invalid/Array1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/invalid/Array1.scala
rename to src/test/resources/regression/verification/xlang/invalid/Array1.scala
diff --git a/src/regression/resources/regression/verification/xlang/invalid/Array2.scala b/src/test/resources/regression/verification/xlang/invalid/Array2.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/invalid/Array2.scala
rename to src/test/resources/regression/verification/xlang/invalid/Array2.scala
diff --git a/src/regression/resources/regression/verification/xlang/invalid/Array3.scala b/src/test/resources/regression/verification/xlang/invalid/Array3.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/invalid/Array3.scala
rename to src/test/resources/regression/verification/xlang/invalid/Array3.scala
diff --git a/src/regression/resources/regression/verification/xlang/invalid/Array4.scala b/src/test/resources/regression/verification/xlang/invalid/Array4.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/invalid/Array4.scala
rename to src/test/resources/regression/verification/xlang/invalid/Array4.scala
diff --git a/src/regression/resources/regression/verification/xlang/invalid/Array5.scala b/src/test/resources/regression/verification/xlang/invalid/Array5.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/invalid/Array5.scala
rename to src/test/resources/regression/verification/xlang/invalid/Array5.scala
diff --git a/src/regression/resources/regression/verification/xlang/invalid/Array6.scala b/src/test/resources/regression/verification/xlang/invalid/Array6.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/invalid/Array6.scala
rename to src/test/resources/regression/verification/xlang/invalid/Array6.scala
diff --git a/src/regression/resources/regression/verification/xlang/invalid/Asserts.scala b/src/test/resources/regression/verification/xlang/invalid/Asserts.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/invalid/Asserts.scala
rename to src/test/resources/regression/verification/xlang/invalid/Asserts.scala
diff --git a/src/regression/resources/regression/verification/xlang/invalid/Epsilon1.scala b/src/test/resources/regression/verification/xlang/invalid/Epsilon1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/invalid/Epsilon1.scala
rename to src/test/resources/regression/verification/xlang/invalid/Epsilon1.scala
diff --git a/src/regression/resources/regression/verification/xlang/invalid/Epsilon2.scala b/src/test/resources/regression/verification/xlang/invalid/Epsilon2.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/invalid/Epsilon2.scala
rename to src/test/resources/regression/verification/xlang/invalid/Epsilon2.scala
diff --git a/src/regression/resources/regression/verification/xlang/invalid/Epsilon3.scala b/src/test/resources/regression/verification/xlang/invalid/Epsilon3.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/invalid/Epsilon3.scala
rename to src/test/resources/regression/verification/xlang/invalid/Epsilon3.scala
diff --git a/src/regression/resources/regression/verification/xlang/invalid/Epsilon4.scala b/src/test/resources/regression/verification/xlang/invalid/Epsilon4.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/invalid/Epsilon4.scala
rename to src/test/resources/regression/verification/xlang/invalid/Epsilon4.scala
diff --git a/src/regression/resources/regression/verification/xlang/invalid/Epsilon5.scala b/src/test/resources/regression/verification/xlang/invalid/Epsilon5.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/invalid/Epsilon5.scala
rename to src/test/resources/regression/verification/xlang/invalid/Epsilon5.scala
diff --git a/src/regression/resources/regression/verification/xlang/invalid/Epsilon6.scala b/src/test/resources/regression/verification/xlang/invalid/Epsilon6.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/invalid/Epsilon6.scala
rename to src/test/resources/regression/verification/xlang/invalid/Epsilon6.scala
diff --git a/src/regression/resources/regression/verification/xlang/invalid/IfExpr1.scala b/src/test/resources/regression/verification/xlang/invalid/IfExpr1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/invalid/IfExpr1.scala
rename to src/test/resources/regression/verification/xlang/invalid/IfExpr1.scala
diff --git a/src/regression/resources/regression/verification/xlang/invalid/IfExpr2.scala b/src/test/resources/regression/verification/xlang/invalid/IfExpr2.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/invalid/IfExpr2.scala
rename to src/test/resources/regression/verification/xlang/invalid/IfExpr2.scala
diff --git a/src/regression/resources/regression/verification/xlang/invalid/Mean.scala b/src/test/resources/regression/verification/xlang/invalid/Mean.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/invalid/Mean.scala
rename to src/test/resources/regression/verification/xlang/invalid/Mean.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/Arithmetic.scala b/src/test/resources/regression/verification/xlang/valid/Arithmetic.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/Arithmetic.scala
rename to src/test/resources/regression/verification/xlang/valid/Arithmetic.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/Array1.scala b/src/test/resources/regression/verification/xlang/valid/Array1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/Array1.scala
rename to src/test/resources/regression/verification/xlang/valid/Array1.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/Array2.scala b/src/test/resources/regression/verification/xlang/valid/Array2.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/Array2.scala
rename to src/test/resources/regression/verification/xlang/valid/Array2.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/Array3.scala b/src/test/resources/regression/verification/xlang/valid/Array3.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/Array3.scala
rename to src/test/resources/regression/verification/xlang/valid/Array3.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/Array4.scala b/src/test/resources/regression/verification/xlang/valid/Array4.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/Array4.scala
rename to src/test/resources/regression/verification/xlang/valid/Array4.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/Array5.scala b/src/test/resources/regression/verification/xlang/valid/Array5.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/Array5.scala
rename to src/test/resources/regression/verification/xlang/valid/Array5.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/Array6.scala b/src/test/resources/regression/verification/xlang/valid/Array6.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/Array6.scala
rename to src/test/resources/regression/verification/xlang/valid/Array6.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/Array7.scala b/src/test/resources/regression/verification/xlang/valid/Array7.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/Array7.scala
rename to src/test/resources/regression/verification/xlang/valid/Array7.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/Array8.scala b/src/test/resources/regression/verification/xlang/valid/Array8.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/Array8.scala
rename to src/test/resources/regression/verification/xlang/valid/Array8.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/Array9.scala b/src/test/resources/regression/verification/xlang/valid/Array9.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/Array9.scala
rename to src/test/resources/regression/verification/xlang/valid/Array9.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/Assign1.scala b/src/test/resources/regression/verification/xlang/valid/Assign1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/Assign1.scala
rename to src/test/resources/regression/verification/xlang/valid/Assign1.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/Choose1.scala b/src/test/resources/regression/verification/xlang/valid/Choose1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/Choose1.scala
rename to src/test/resources/regression/verification/xlang/valid/Choose1.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/Epsilon1.scala b/src/test/resources/regression/verification/xlang/valid/Epsilon1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/Epsilon1.scala
rename to src/test/resources/regression/verification/xlang/valid/Epsilon1.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/Epsilon2.scala b/src/test/resources/regression/verification/xlang/valid/Epsilon2.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/Epsilon2.scala
rename to src/test/resources/regression/verification/xlang/valid/Epsilon2.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/Epsilon3.scala b/src/test/resources/regression/verification/xlang/valid/Epsilon3.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/Epsilon3.scala
rename to src/test/resources/regression/verification/xlang/valid/Epsilon3.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/Epsilon4.scala b/src/test/resources/regression/verification/xlang/valid/Epsilon4.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/Epsilon4.scala
rename to src/test/resources/regression/verification/xlang/valid/Epsilon4.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/Epsilon5.scala b/src/test/resources/regression/verification/xlang/valid/Epsilon5.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/Epsilon5.scala
rename to src/test/resources/regression/verification/xlang/valid/Epsilon5.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/IfExpr1.scala b/src/test/resources/regression/verification/xlang/valid/IfExpr1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/IfExpr1.scala
rename to src/test/resources/regression/verification/xlang/valid/IfExpr1.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/IfExpr2.scala b/src/test/resources/regression/verification/xlang/valid/IfExpr2.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/IfExpr2.scala
rename to src/test/resources/regression/verification/xlang/valid/IfExpr2.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/IfExpr3.scala b/src/test/resources/regression/verification/xlang/valid/IfExpr3.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/IfExpr3.scala
rename to src/test/resources/regression/verification/xlang/valid/IfExpr3.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/IfExpr4.scala b/src/test/resources/regression/verification/xlang/valid/IfExpr4.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/IfExpr4.scala
rename to src/test/resources/regression/verification/xlang/valid/IfExpr4.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/Mean.scala b/src/test/resources/regression/verification/xlang/valid/Mean.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/Mean.scala
rename to src/test/resources/regression/verification/xlang/valid/Mean.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/Nested1.scala b/src/test/resources/regression/verification/xlang/valid/Nested1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/Nested1.scala
rename to src/test/resources/regression/verification/xlang/valid/Nested1.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/Nested10.scala b/src/test/resources/regression/verification/xlang/valid/Nested10.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/Nested10.scala
rename to src/test/resources/regression/verification/xlang/valid/Nested10.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/Nested11.scala b/src/test/resources/regression/verification/xlang/valid/Nested11.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/Nested11.scala
rename to src/test/resources/regression/verification/xlang/valid/Nested11.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/Nested12.scala b/src/test/resources/regression/verification/xlang/valid/Nested12.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/Nested12.scala
rename to src/test/resources/regression/verification/xlang/valid/Nested12.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/Nested13.scala b/src/test/resources/regression/verification/xlang/valid/Nested13.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/Nested13.scala
rename to src/test/resources/regression/verification/xlang/valid/Nested13.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/Nested14.scala b/src/test/resources/regression/verification/xlang/valid/Nested14.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/Nested14.scala
rename to src/test/resources/regression/verification/xlang/valid/Nested14.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/Nested2.scala b/src/test/resources/regression/verification/xlang/valid/Nested2.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/Nested2.scala
rename to src/test/resources/regression/verification/xlang/valid/Nested2.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/Nested3.scala b/src/test/resources/regression/verification/xlang/valid/Nested3.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/Nested3.scala
rename to src/test/resources/regression/verification/xlang/valid/Nested3.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/Nested4.scala b/src/test/resources/regression/verification/xlang/valid/Nested4.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/Nested4.scala
rename to src/test/resources/regression/verification/xlang/valid/Nested4.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/Nested5.scala b/src/test/resources/regression/verification/xlang/valid/Nested5.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/Nested5.scala
rename to src/test/resources/regression/verification/xlang/valid/Nested5.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/Nested6.scala b/src/test/resources/regression/verification/xlang/valid/Nested6.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/Nested6.scala
rename to src/test/resources/regression/verification/xlang/valid/Nested6.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/Nested7.scala b/src/test/resources/regression/verification/xlang/valid/Nested7.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/Nested7.scala
rename to src/test/resources/regression/verification/xlang/valid/Nested7.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/Nested8.scala b/src/test/resources/regression/verification/xlang/valid/Nested8.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/Nested8.scala
rename to src/test/resources/regression/verification/xlang/valid/Nested8.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/Nested9.scala b/src/test/resources/regression/verification/xlang/valid/Nested9.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/Nested9.scala
rename to src/test/resources/regression/verification/xlang/valid/Nested9.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/NestedVar.scala b/src/test/resources/regression/verification/xlang/valid/NestedVar.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/NestedVar.scala
rename to src/test/resources/regression/verification/xlang/valid/NestedVar.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/ShortCircuit.scala b/src/test/resources/regression/verification/xlang/valid/ShortCircuit.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/ShortCircuit.scala
rename to src/test/resources/regression/verification/xlang/valid/ShortCircuit.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/While1.scala b/src/test/resources/regression/verification/xlang/valid/While1.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/While1.scala
rename to src/test/resources/regression/verification/xlang/valid/While1.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/While2.scala b/src/test/resources/regression/verification/xlang/valid/While2.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/While2.scala
rename to src/test/resources/regression/verification/xlang/valid/While2.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/While3.scala b/src/test/resources/regression/verification/xlang/valid/While3.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/While3.scala
rename to src/test/resources/regression/verification/xlang/valid/While3.scala
diff --git a/src/regression/resources/regression/verification/xlang/valid/WhileConditionSubexpression.scala b/src/test/resources/regression/verification/xlang/valid/WhileConditionSubexpression.scala
similarity index 100%
rename from src/regression/resources/regression/verification/xlang/valid/WhileConditionSubexpression.scala
rename to src/test/resources/regression/verification/xlang/valid/WhileConditionSubexpression.scala
diff --git a/src/integration/scala/leon/integration/evaluators/CodegenEvaluatorSuite.scala b/src/test/scala/leon/integration/evaluators/CodegenEvaluatorSuite.scala
similarity index 99%
rename from src/integration/scala/leon/integration/evaluators/CodegenEvaluatorSuite.scala
rename to src/test/scala/leon/integration/evaluators/CodegenEvaluatorSuite.scala
index 29f4a78a860ae1496e662866e449833d56498302..cfda6e0ce030d8f6b8d80aff0ea603278aaaf147 100644
--- a/src/integration/scala/leon/integration/evaluators/CodegenEvaluatorSuite.scala
+++ b/src/test/scala/leon/integration/evaluators/CodegenEvaluatorSuite.scala
@@ -2,8 +2,8 @@
 
 package leon.integration.evaluators
 
+import leon.test._
 import leon.evaluators._
-import leon.integration.LeonTestSuiteWithProgram
 
 import leon.purescala.Common._
 import leon.purescala.Definitions._
diff --git a/src/integration/scala/leon/integration/evaluators/EvaluatorSuite.scala b/src/test/scala/leon/integration/evaluators/EvaluatorSuite.scala
similarity index 99%
rename from src/integration/scala/leon/integration/evaluators/EvaluatorSuite.scala
rename to src/test/scala/leon/integration/evaluators/EvaluatorSuite.scala
index 6465d764afe9c192ab7f3c8e4a303a9419f94b92..6eaf481381b7d433a0566c9433a077e026399e5e 100644
--- a/src/integration/scala/leon/integration/evaluators/EvaluatorSuite.scala
+++ b/src/test/scala/leon/integration/evaluators/EvaluatorSuite.scala
@@ -3,9 +3,8 @@
 package leon.integration.evaluators
 
 import leon._
-import leon.integration.LeonTestSuiteWithProgram
-import leon.integration.helpers.ExpressionsDSL
 import leon.test._
+import leon.test.helpers._
 import leon.evaluators._
 
 import leon.utils.{TemporaryInputPhase, PreprocessingPhase}
diff --git a/src/integration/scala/leon/integration/purescala/DataGenSuite.scala b/src/test/scala/leon/integration/purescala/DataGenSuite.scala
similarity index 94%
rename from src/integration/scala/leon/integration/purescala/DataGenSuite.scala
rename to src/test/scala/leon/integration/purescala/DataGenSuite.scala
index bb9fe8fe9df66e73d0c72de6caaee439d998be45..3a2eaf24fbdc5b6cbbf66625970a068b513dd595 100644
--- a/src/integration/scala/leon/integration/purescala/DataGenSuite.scala
+++ b/src/test/scala/leon/integration/purescala/DataGenSuite.scala
@@ -2,8 +2,6 @@
 
 package leon.integration.purescala
 
-import leon.integration.LeonTestSuiteWithProgram
-import leon.integration.helpers.ExpressionsDSL
 import leon.test._
 import leon.utils.{TemporaryInputPhase, PreprocessingPhase}
 import leon.frontends.scalac.ExtractionPhase
@@ -16,7 +14,7 @@ import leon.datagen._
 
 import leon.evaluators._
 
-class DataGenSuite extends LeonTestSuiteWithProgram with ExpressionsDSL {
+class DataGenSuite extends LeonTestSuiteWithProgram with helpers.ExpressionsDSL {
   val sources = List(
     """|import leon.lang._
        |object Program {
diff --git a/src/integration/scala/leon/integration/purescala/DefOpsSuite.scala b/src/test/scala/leon/integration/purescala/DefOpsSuite.scala
similarity index 98%
rename from src/integration/scala/leon/integration/purescala/DefOpsSuite.scala
rename to src/test/scala/leon/integration/purescala/DefOpsSuite.scala
index b477d07ac60c1242ca7e1dff208d447fcc1e35d0..3df239fb142498445443586e49e1fc3fc57e177b 100644
--- a/src/integration/scala/leon/integration/purescala/DefOpsSuite.scala
+++ b/src/test/scala/leon/integration/purescala/DefOpsSuite.scala
@@ -2,7 +2,6 @@
 
 package leon.integration.purescala
 
-import leon.integration.LeonTestSuiteWithProgram
 import leon.test._
 
 import leon._
diff --git a/src/integration/scala/leon/integration/purescala/ExprOpsSuite.scala b/src/test/scala/leon/integration/purescala/ExprOpsSuite.scala
similarity index 93%
rename from src/integration/scala/leon/integration/purescala/ExprOpsSuite.scala
rename to src/test/scala/leon/integration/purescala/ExprOpsSuite.scala
index abd4bf93d4989c9a042dae363d204a7883fc9221..3de0828b68b005348bbd2b5398d998fad9c9c142 100644
--- a/src/integration/scala/leon/integration/purescala/ExprOpsSuite.scala
+++ b/src/test/scala/leon/integration/purescala/ExprOpsSuite.scala
@@ -2,8 +2,6 @@
 
 package leon.integration.purescala
 
-import leon.integration.LeonTestSuiteWithProgram
-import leon.integration.helpers.ExpressionsDSL
 import leon.test._
 
 import leon._
@@ -15,7 +13,7 @@ import leon.purescala.DefOps._
 import leon.purescala.Common._
 import leon.utils._
 
-class ExprOpsSuite extends LeonTestSuiteWithProgram with ExpressionsDSL {
+class ExprOpsSuite extends LeonTestSuiteWithProgram with helpers.ExpressionsDSL {
 
   val sources = List(
       """object Casts1 {
diff --git a/src/integration/scala/leon/integration/purescala/InliningSuite.scala b/src/test/scala/leon/integration/purescala/InliningSuite.scala
similarity index 86%
rename from src/integration/scala/leon/integration/purescala/InliningSuite.scala
rename to src/test/scala/leon/integration/purescala/InliningSuite.scala
index 4faeb09703419d0ac12305c5646eae366275b6e0..fbbc8765a1c3b627dccd0cf783f03d69eba8b126 100644
--- a/src/integration/scala/leon/integration/purescala/InliningSuite.scala
+++ b/src/test/scala/leon/integration/purescala/InliningSuite.scala
@@ -2,12 +2,10 @@
 
 package leon.integration.purescala
 
-import leon.integration.LeonTestSuiteWithProgram
-import leon.integration.helpers.ExpressionsDSL
 import leon.test._
 import leon.purescala.Expressions._
 
-class InliningSuite extends LeonTestSuiteWithProgram with ExpressionsDSL {
+class InliningSuite extends LeonTestSuiteWithProgram with helpers.ExpressionsDSL {
   val sources = List(
     """|
        |import leon.lang._
diff --git a/src/integration/scala/leon/integration/purescala/SimplifyPathsSuite.scala b/src/test/scala/leon/integration/purescala/SimplifyPathsSuite.scala
similarity index 100%
rename from src/integration/scala/leon/integration/purescala/SimplifyPathsSuite.scala
rename to src/test/scala/leon/integration/purescala/SimplifyPathsSuite.scala
diff --git a/src/integration/scala/leon/integration/solvers/EnumerationSolverSuite.scala b/src/test/scala/leon/integration/solvers/EnumerationSolverSuite.scala
similarity index 100%
rename from src/integration/scala/leon/integration/solvers/EnumerationSolverSuite.scala
rename to src/test/scala/leon/integration/solvers/EnumerationSolverSuite.scala
diff --git a/src/integration/scala/leon/integration/solvers/FairZ3SolverTests.scala b/src/test/scala/leon/integration/solvers/FairZ3SolverTests.scala
similarity index 100%
rename from src/integration/scala/leon/integration/solvers/FairZ3SolverTests.scala
rename to src/test/scala/leon/integration/solvers/FairZ3SolverTests.scala
diff --git a/src/integration/scala/leon/integration/solvers/LeonSolverSuite.scala b/src/test/scala/leon/integration/solvers/LeonSolverSuite.scala
similarity index 98%
rename from src/integration/scala/leon/integration/solvers/LeonSolverSuite.scala
rename to src/test/scala/leon/integration/solvers/LeonSolverSuite.scala
index 6344fc9372bb60ee0de17479f5e1052ab062710e..6c2064f95584b718e00210a342a01e33beefe2fb 100644
--- a/src/integration/scala/leon/integration/solvers/LeonSolverSuite.scala
+++ b/src/test/scala/leon/integration/solvers/LeonSolverSuite.scala
@@ -1,6 +1,5 @@
 package leon.integration.solvers
 
-import leon.integration.LeonTestSuiteWithProgram
 import leon.test._
 import leon.purescala.Common._
 import leon.purescala.Definitions._
diff --git a/src/integration/scala/leon/integration/solvers/ModelEnumerationSuite.scala b/src/test/scala/leon/integration/solvers/ModelEnumerationSuite.scala
similarity index 98%
rename from src/integration/scala/leon/integration/solvers/ModelEnumerationSuite.scala
rename to src/test/scala/leon/integration/solvers/ModelEnumerationSuite.scala
index eccec9b245d698f7de22a80166a95a0ffec71b89..9a23fd6003d6e95072e74a294ea3255d3459a7ae 100644
--- a/src/integration/scala/leon/integration/solvers/ModelEnumerationSuite.scala
+++ b/src/test/scala/leon/integration/solvers/ModelEnumerationSuite.scala
@@ -2,9 +2,8 @@
 
 package leon.integration.solvers
 
-import leon.integration.LeonTestSuiteWithProgram
-import leon.integration.helpers.ExpressionsDSL
 import leon.test._
+import leon.test.helpers._
 import leon._
 import leon.solvers._
 import leon.utils._
diff --git a/src/integration/scala/leon/integration/solvers/TimeoutSolverSuite.scala b/src/test/scala/leon/integration/solvers/TimeoutSolverSuite.scala
similarity index 100%
rename from src/integration/scala/leon/integration/solvers/TimeoutSolverSuite.scala
rename to src/test/scala/leon/integration/solvers/TimeoutSolverSuite.scala
diff --git a/src/integration/scala/leon/integration/solvers/UnrollingSolverSuite.scala b/src/test/scala/leon/integration/solvers/UnrollingSolverSuite.scala
similarity index 100%
rename from src/integration/scala/leon/integration/solvers/UnrollingSolverSuite.scala
rename to src/test/scala/leon/integration/solvers/UnrollingSolverSuite.scala
diff --git a/src/regression/scala/leon/regression/frontends/FrontEndsSuite.scala b/src/test/scala/leon/regression/frontends/FrontEndsSuite.scala
similarity index 94%
rename from src/regression/scala/leon/regression/frontends/FrontEndsSuite.scala
rename to src/test/scala/leon/regression/frontends/FrontEndsSuite.scala
index 1662e0eb655666e47cedce9300656fb808564046..dbff76a45961b5bea101aec2b62cc90d289a0bae 100644
--- a/src/regression/scala/leon/regression/frontends/FrontEndsSuite.scala
+++ b/src/test/scala/leon/regression/frontends/FrontEndsSuite.scala
@@ -3,11 +3,11 @@
 package leon.regression.frontends
 
 import leon._
-import leon.regression.LeonTestSuite
+import leon.test._
 import purescala.Definitions.Program
 import java.io.File
 
-class FrontEndsSuite extends LeonTestSuite {
+class FrontEndsSuite extends LeonRegressionSuite {
   // Hard-code output directory, for Eclipse purposes
 
   val pipeFront = frontends.scalac.ExtractionPhase andThen utils.PreprocessingPhase
diff --git a/src/regression/scala/leon/regression/repair/RepairSuite.scala b/src/test/scala/leon/regression/repair/RepairSuite.scala
similarity index 92%
rename from src/regression/scala/leon/regression/repair/RepairSuite.scala
rename to src/test/scala/leon/regression/repair/RepairSuite.scala
index 1b5bd1012f1d5d79b2b6d7d652b21470bb610336..f0d5f4ea2a0fffaadd90d7ec03f539a0f98e8f97 100644
--- a/src/regression/scala/leon/regression/repair/RepairSuite.scala
+++ b/src/test/scala/leon/regression/repair/RepairSuite.scala
@@ -1,15 +1,14 @@
 /* Copyright 2009-2015 EPFL, Lausanne */
 
-package leon.regression
-package repair
+package leon.regression.repair
 
-import leon.test._
 import leon._
+import leon.test._
 import leon.utils._
 import leon.frontends.scalac.ExtractionPhase
 import leon.repair._
 
-class RepairSuite extends regression.LeonTestSuite {
+class RepairSuite extends LeonRegressionSuite {
   val pipeline = ExtractionPhase andThen 
     PreprocessingPhase andThen
     RepairPhase
diff --git a/src/regression/scala/leon/regression/synthesis/StablePrintingSuite.scala b/src/test/scala/leon/regression/synthesis/StablePrintingSuite.scala
similarity index 97%
rename from src/regression/scala/leon/regression/synthesis/StablePrintingSuite.scala
rename to src/test/scala/leon/regression/synthesis/StablePrintingSuite.scala
index 405500dc6e4e7d7778b1680e5f9577b0618eea03..99f8bcfa8b093518220a8444dd259245f443edca 100644
--- a/src/regression/scala/leon/regression/synthesis/StablePrintingSuite.scala
+++ b/src/test/scala/leon/regression/synthesis/StablePrintingSuite.scala
@@ -1,9 +1,10 @@
 /* Copyright 2009-2015 EPFL, Lausanne */
 
-package leon.regression
-package synthesis
+package leon.regression.synthesis
 
 import leon._
+import leon.test._
+
 import leon.purescala.Definitions._
 import leon.purescala.ScalaPrinter
 import leon.purescala.PrinterContext
@@ -15,7 +16,7 @@ import scala.io.Source
 
 import java.io.File
 
-class StablePrintingSuite extends regression.LeonTestSuite {
+class StablePrintingSuite extends LeonRegressionSuite {
   private def forEachFileIn(path : String)(block : File => Unit) {
     val fs = filesInResourceDir(path, _.endsWith(".scala"))
 
diff --git a/src/regression/scala/leon/regression/synthesis/SynthesisRegressionSuite.scala b/src/test/scala/leon/regression/synthesis/SynthesisRegressionSuite.scala
similarity index 96%
rename from src/regression/scala/leon/regression/synthesis/SynthesisRegressionSuite.scala
rename to src/test/scala/leon/regression/synthesis/SynthesisRegressionSuite.scala
index 590f5d7a960655386794d428d6bc91cb0ba76ddd..471ea9ee2ed2927e9b2e2982bb8329eed0fdca85 100644
--- a/src/regression/scala/leon/regression/synthesis/SynthesisRegressionSuite.scala
+++ b/src/test/scala/leon/regression/synthesis/SynthesisRegressionSuite.scala
@@ -10,7 +10,7 @@ import leon.synthesis._
 
 import java.io.File
 
-class SynthesisRegressionSuite extends regression.LeonTestSuite {
+class SynthesisRegressionSuite extends LeonRegressionSuite {
   private def forEachFileIn(path : String)(block : File => Unit) {
     val fs = filesInResourceDir(path, _.endsWith(".scala"))
 
diff --git a/src/regression/scala/leon/regression/synthesis/SynthesisSuite.scala b/src/test/scala/leon/regression/synthesis/SynthesisSuite.scala
similarity index 99%
rename from src/regression/scala/leon/regression/synthesis/SynthesisSuite.scala
rename to src/test/scala/leon/regression/synthesis/SynthesisSuite.scala
index b071343259c9e74bc7de0ca6332b30c4c5898bd1..76497ccf22064d398dced645fed197952db7a2a1 100644
--- a/src/regression/scala/leon/regression/synthesis/SynthesisSuite.scala
+++ b/src/test/scala/leon/regression/synthesis/SynthesisSuite.scala
@@ -9,7 +9,7 @@ import leon.synthesis.graph._
 import leon.synthesis.utils._
 import leon.utils.PreprocessingPhase
 
-class SynthesisSuite extends regression.LeonTestSuite {
+class SynthesisSuite extends LeonRegressionSuite {
   private var counter : Int = 0
   private def nextInt() : Int = {
     counter += 1
diff --git a/src/regression/scala/leon/regression/termination/TerminationSuite.scala b/src/test/scala/leon/regression/termination/TerminationSuite.scala
similarity index 98%
rename from src/regression/scala/leon/regression/termination/TerminationSuite.scala
rename to src/test/scala/leon/regression/termination/TerminationSuite.scala
index 7adffa0b1910c9ed0b8d9cc66693e4dc5e914b34..423526c098043b6da7fdd17dcdde90a274f7280c 100644
--- a/src/regression/scala/leon/regression/termination/TerminationSuite.scala
+++ b/src/test/scala/leon/regression/termination/TerminationSuite.scala
@@ -9,7 +9,7 @@ import leon.termination._
 
 import java.io.File
 
-class TerminationSuite extends regression.LeonTestSuite {
+class TerminationSuite extends LeonRegressionSuite {
   private var counter : Int = 0
   private def nextInt() : Int = {
     counter += 1
diff --git a/src/regression/scala/leon/regression/testcases/TestCasesCompile.scala b/src/test/scala/leon/regression/testcases/TestCasesCompile.scala
similarity index 93%
rename from src/regression/scala/leon/regression/testcases/TestCasesCompile.scala
rename to src/test/scala/leon/regression/testcases/TestCasesCompile.scala
index 2064eb4b203d6ba92afb355b2eddeb62fddd89a6..476909e2646f796ad177ba6f0167633c09e588a1 100644
--- a/src/regression/scala/leon/regression/testcases/TestCasesCompile.scala
+++ b/src/test/scala/leon/regression/testcases/TestCasesCompile.scala
@@ -3,12 +3,12 @@
 package leon.regression.testcases
 
 import leon._
-import leon.regression.LeonTestSuite
+import leon.test._
 import org.scalatest.time.SpanSugar._
 import java.io.File
 import org.scalatest.ParallelTestExecution
 
-class TestCasesCompile extends LeonTestSuite {
+class TestCasesCompile extends LeonRegressionSuite {
   val pipeline = frontends.scalac.ExtractionPhase andThen utils.PreprocessingPhase
 
   private def filesIn(path : String): Seq[File] = {
diff --git a/src/regression/scala/leon/regression/verification/LibraryVerificationSuite.scala b/src/test/scala/leon/regression/verification/LibraryVerificationSuite.scala
similarity index 84%
rename from src/regression/scala/leon/regression/verification/LibraryVerificationSuite.scala
rename to src/test/scala/leon/regression/verification/LibraryVerificationSuite.scala
index ca3e20ca8c27cd3a7d0a441068af16ae5e6fb03b..5f3e4a1db0f107bcc9c29dad83113e16c81cb991 100644
--- a/src/regression/scala/leon/regression/verification/LibraryVerificationSuite.scala
+++ b/src/test/scala/leon/regression/verification/LibraryVerificationSuite.scala
@@ -1,14 +1,14 @@
 /* Copyright 2009-2015 EPFL, Lausanne */
 
-package leon.regression
-package verification
+package leon.regression.verification
 
 import leon._
+import leon.test._
 import leon.frontends.scalac.ExtractionPhase
 import leon.utils.PreprocessingPhase
 import leon.verification.AnalysisPhase
 
-class LibraryVerificationSuite extends regression.LeonTestSuite {
+class LibraryVerificationSuite extends LeonRegressionSuite {
   test("Verify the library") {
       val pipeline = ExtractionPhase    andThen
                      PreprocessingPhase andThen
diff --git a/src/regression/scala/leon/regression/verification/NewSolversSuite.scala b/src/test/scala/leon/regression/verification/NewSolversSuite.scala
similarity index 100%
rename from src/regression/scala/leon/regression/verification/NewSolversSuite.scala
rename to src/test/scala/leon/regression/verification/NewSolversSuite.scala
diff --git a/src/regression/scala/leon/regression/verification/PureScalaVerificationSuite.scala b/src/test/scala/leon/regression/verification/PureScalaVerificationSuite.scala
similarity index 100%
rename from src/regression/scala/leon/regression/verification/PureScalaVerificationSuite.scala
rename to src/test/scala/leon/regression/verification/PureScalaVerificationSuite.scala
diff --git a/src/regression/scala/leon/regression/verification/VerificationSuite.scala b/src/test/scala/leon/regression/verification/VerificationSuite.scala
similarity index 96%
rename from src/regression/scala/leon/regression/verification/VerificationSuite.scala
rename to src/test/scala/leon/regression/verification/VerificationSuite.scala
index de6b01ea44ba5412f81c8044d3ee205832a6443c..f8e78c78d8698a38824b83112d21fe856212e075 100644
--- a/src/regression/scala/leon/regression/verification/VerificationSuite.scala
+++ b/src/test/scala/leon/regression/verification/VerificationSuite.scala
@@ -1,9 +1,9 @@
 /* Copyright 2009-2015 EPFL, Lausanne */
 
-package leon.regression
-package verification
+package leon.regression.verification
 
 import leon._
+import leon.test._
 
 import leon.verification.VerificationReport
 import leon.purescala.Definitions.Program
@@ -14,7 +14,7 @@ import org.scalatest.{Reporter => TestReporter, _}
 
 // If you add another regression test, make sure it contains one object whose name matches the file name
 // This is because we compile all tests from each folder separately.
-trait VerificationSuite extends regression.LeonTestSuite {
+trait VerificationSuite extends LeonRegressionSuite {
 
   val optionVariants: List[List[String]]
   val testDir: String
diff --git a/src/regression/scala/leon/regression/verification/XLangVerificationSuite.scala b/src/test/scala/leon/regression/verification/XLangVerificationSuite.scala
similarity index 97%
rename from src/regression/scala/leon/regression/verification/XLangVerificationSuite.scala
rename to src/test/scala/leon/regression/verification/XLangVerificationSuite.scala
index 64c7a1161dcccb349138721457fe4773c9556f5d..b07c9b5e09e461a27eb9898bff48211e16e16532 100644
--- a/src/regression/scala/leon/regression/verification/XLangVerificationSuite.scala
+++ b/src/test/scala/leon/regression/verification/XLangVerificationSuite.scala
@@ -14,7 +14,7 @@ import _root_.smtlib.interpreters._
 
 import java.io.File
 
-class XLangVerificationSuite extends regression.LeonTestSuite {
+class XLangVerificationSuite extends LeonRegressionSuite {
   private var counter : Int = 0
   private def nextInt() : Int = {
     counter += 1
diff --git a/src/regression/scala/leon/regression/LeonTestSuite.scala b/src/test/scala/leon/test/LeonRegressionSuite.scala
similarity index 96%
rename from src/regression/scala/leon/regression/LeonTestSuite.scala
rename to src/test/scala/leon/test/LeonRegressionSuite.scala
index d7cea941507cf6720de5fdcdae9a6ef2cd6837ff..78c56589b66b87fe288d4a1fceabeaaee12b7ec1 100644
--- a/src/regression/scala/leon/regression/LeonTestSuite.scala
+++ b/src/test/scala/leon/test/LeonRegressionSuite.scala
@@ -1,6 +1,6 @@
 /* Copyright 2009-2015 EPFL, Lausanne */
 
-package leon.regression
+package leon.test
 
 import leon._
 import leon.utils._
@@ -14,7 +14,7 @@ import org.scalatest.exceptions.TestFailedException
 
 import java.io.File
 
-trait LeonTestSuite extends FunSuite with Timeouts with BeforeAndAfterEach {
+trait LeonRegressionSuite extends FunSuite with Timeouts with BeforeAndAfterEach {
   // Hard-code resource directory, for Eclipse purposes
   val resourceDirHard = "src/test/resources/"
 
diff --git a/src/integration/scala/leon/integration/LeonTestSuiteWithProgram.scala b/src/test/scala/leon/test/LeonTestSuiteWithProgram.scala
similarity index 98%
rename from src/integration/scala/leon/integration/LeonTestSuiteWithProgram.scala
rename to src/test/scala/leon/test/LeonTestSuiteWithProgram.scala
index 27c29f038799a950dc0f8f1d32cf3c8effbf451c..17d65364de16d2a37b26be4a6ca147ac5c5ccb41 100644
--- a/src/integration/scala/leon/integration/LeonTestSuiteWithProgram.scala
+++ b/src/test/scala/leon/test/LeonTestSuiteWithProgram.scala
@@ -1,6 +1,6 @@
 /* Copyright 2009-2015 EPFL, Lausanne */
 
-package leon.integration
+package leon.test
 
 import leon._
 import leon.purescala.Definitions.Program
diff --git a/src/test/scala/leon/test/TestSilentReporter.scala b/src/test/scala/leon/test/TestSilentReporter.scala
index a303d35a99ed6a76d2068a9a279fb5ec664e5d38..2cf9ea4f7f6c78d4f07002a01f434a150e0d9034 100644
--- a/src/test/scala/leon/test/TestSilentReporter.scala
+++ b/src/test/scala/leon/test/TestSilentReporter.scala
@@ -1,6 +1,7 @@
 /* Copyright 2009-2015 EPFL, Lausanne */
 
 package leon.test
+
 import leon.DefaultReporter
 
 class TestSilentReporter extends DefaultReporter(Set()) {
diff --git a/src/test/scala/leon/test/helpers/WithLikelyEq.scala b/src/test/scala/leon/test/helpers/WithLikelyEq.scala
index c998591f582dc605550bc1c9e42dbbb44f41a529..aee9e7671d5f0d64e4e81bd0a6b82c6b514b2e20 100644
--- a/src/test/scala/leon/test/helpers/WithLikelyEq.scala
+++ b/src/test/scala/leon/test/helpers/WithLikelyEq.scala
@@ -38,9 +38,7 @@ trait WithLikelyEq {
       val r1 = evaluator.eval(e1)
       val r2 = evaluator.eval(e2)
 
-      if (r1 != r2) {
-        fail(s"'${e1.asString(ctx)}' != '${e2.asString(ctx)}' ('$r1' != '$r2')")
-      }
+      assert(r1 === r2, s"'$e1' != '$e2' ('$r1' != '$r2')")
     } else {
 
       val allValues = freeVars.map(id => values.get(id).map(Seq(_)).getOrElse(typesValues(id.getType)))
@@ -59,9 +57,7 @@ trait WithLikelyEq {
           val r1 = evaluator.eval(e1, m)
           val r2 = evaluator.eval(e2, m)
 
-          if (r1 != r2) {
-            fail(s"'${e1.asString(ctx)}' != '${e2.asString(ctx)}' with '$m' ('$r1' != '$r2')")
-          }
+          assert(r1 === r2, s"'$e1' != '$e2' with '$m' ('$r1' != '$r2')")
         }
       }
     }
diff --git a/src/test/scala/leon/test/evaluators/EvaluatorSuite.scala b/src/test/scala/leon/unit/evaluators/EvaluatorSuite.scala
similarity index 99%
rename from src/test/scala/leon/test/evaluators/EvaluatorSuite.scala
rename to src/test/scala/leon/unit/evaluators/EvaluatorSuite.scala
index ffbd82e9b716869454456e361a26cc5570bd5b58..a18a0dca273ce1a53e47ab8cfc67cc93327348ea 100644
--- a/src/test/scala/leon/test/evaluators/EvaluatorSuite.scala
+++ b/src/test/scala/leon/unit/evaluators/EvaluatorSuite.scala
@@ -1,6 +1,6 @@
 /* Copyright 2009-2015 EPFL, Lausanne */
 
-package leon.test.allEvaluators
+package leon.unit.allEvaluators
 
 import leon._
 import leon.test._
diff --git a/src/test/scala/leon/test/purescala/ExprOpsSuite.scala b/src/test/scala/leon/unit/purescala/ExprOpsSuite.scala
similarity index 99%
rename from src/test/scala/leon/test/purescala/ExprOpsSuite.scala
rename to src/test/scala/leon/unit/purescala/ExprOpsSuite.scala
index de304264d9c2454e4a31cfc96597ea49e0c6d810..133f0e624bb1c9c27539477213e715092af06a41 100644
--- a/src/test/scala/leon/test/purescala/ExprOpsSuite.scala
+++ b/src/test/scala/leon/unit/purescala/ExprOpsSuite.scala
@@ -1,6 +1,6 @@
 /* Copyright 2009-2015 EPFL, Lausanne */
 
-package leon.test.purescala
+package leon.unit.purescala
 
 import leon.test._
 import leon.purescala.Common._
diff --git a/src/test/scala/leon/test/purescala/SimplifyLetsSuite.scala b/src/test/scala/leon/unit/purescala/SimplifyLetsSuite.scala
similarity index 98%
rename from src/test/scala/leon/test/purescala/SimplifyLetsSuite.scala
rename to src/test/scala/leon/unit/purescala/SimplifyLetsSuite.scala
index db5e12deecae9740577d7ba71d21fa1762b0d5ee..2dd956cdd2ddae2f072b6aeaaafd634f407772f8 100644
--- a/src/test/scala/leon/test/purescala/SimplifyLetsSuite.scala
+++ b/src/test/scala/leon/unit/purescala/SimplifyLetsSuite.scala
@@ -1,6 +1,6 @@
 /* Copyright 2009-2015 EPFL, Lausanne */
 
-package leon.test.purescala
+package leon.unit.purescala
 
 import leon.test._
 
diff --git a/src/test/scala/leon/test/purescala/TreeNormalizationsSuite.scala b/src/test/scala/leon/unit/purescala/TreeNormalizationsSuite.scala
similarity index 98%
rename from src/test/scala/leon/test/purescala/TreeNormalizationsSuite.scala
rename to src/test/scala/leon/unit/purescala/TreeNormalizationsSuite.scala
index 08345e9b3625e328d6cf56c6b9483c76fa5ee604..5337bc0c4c6ff290d2f97166c89291d0fb41b090 100644
--- a/src/test/scala/leon/test/purescala/TreeNormalizationsSuite.scala
+++ b/src/test/scala/leon/unit/purescala/TreeNormalizationsSuite.scala
@@ -1,6 +1,6 @@
 /* Copyright 2009-2015 EPFL, Lausanne */
 
-package leon.test.purescala
+package leon.unit.purescala
 
 import leon.test._
 
diff --git a/src/test/scala/leon/test/purescala/TreeTestsSuite.scala b/src/test/scala/leon/unit/purescala/TreeTestsSuite.scala
similarity index 97%
rename from src/test/scala/leon/test/purescala/TreeTestsSuite.scala
rename to src/test/scala/leon/unit/purescala/TreeTestsSuite.scala
index 0692b3c8bb95cf911748a255e3365989452fe370..33552066ec7e0dd630c37c06899758efc740f8fb 100644
--- a/src/test/scala/leon/test/purescala/TreeTestsSuite.scala
+++ b/src/test/scala/leon/unit/purescala/TreeTestsSuite.scala
@@ -1,6 +1,6 @@
 /* Copyright 2009-2015 EPFL, Lausanne */
 
-package leon.test.purescala
+package leon.unit.purescala
 
 import leon.test._
 
diff --git a/src/test/scala/leon/test/purescala/TypeOpsSuite.scala b/src/test/scala/leon/unit/purescala/TypeOpsSuite.scala
similarity index 99%
rename from src/test/scala/leon/test/purescala/TypeOpsSuite.scala
rename to src/test/scala/leon/unit/purescala/TypeOpsSuite.scala
index af9edfec0f33679c2a7334ebb7ce1fbe2e0f78ff..5d88675507933df093e57dd72b714eeda64b3bb9 100644
--- a/src/test/scala/leon/test/purescala/TypeOpsSuite.scala
+++ b/src/test/scala/leon/unit/purescala/TypeOpsSuite.scala
@@ -1,6 +1,6 @@
 /* Copyright 2009-2015 EPFL, Lausanne */
 
-package leon.test.purescala
+package leon.unit.purescala
 
 import leon.test._
 import leon.purescala.Common._
diff --git a/src/test/scala/leon/test/solvers/SolverPoolSuite.scala b/src/test/scala/leon/unit/solvers/SolverPoolSuite.scala
similarity index 98%
rename from src/test/scala/leon/test/solvers/SolverPoolSuite.scala
rename to src/test/scala/leon/unit/solvers/SolverPoolSuite.scala
index b733ee193a7500f2edd4e2b1719a0e05c7ecfc7b..f6d334454bcb85462dbe08820aafba1e30ee6b78 100644
--- a/src/test/scala/leon/test/solvers/SolverPoolSuite.scala
+++ b/src/test/scala/leon/unit/solvers/SolverPoolSuite.scala
@@ -1,6 +1,6 @@
 /* Copyright 2009-2015 EPFL, Lausanne */
 
-package leon.test.solvers
+package leon.unit.solvers
 
 import leon._
 import leon.test._
diff --git a/src/test/scala/leon/test/synthesis/AlgebraSuite.scala b/src/test/scala/leon/unit/synthesis/AlgebraSuite.scala
similarity index 99%
rename from src/test/scala/leon/test/synthesis/AlgebraSuite.scala
rename to src/test/scala/leon/unit/synthesis/AlgebraSuite.scala
index e1d13fc9b488d80bd59a6133329c038c97c04688..c54b8dda42c9a817cc739711197bce74516a59f9 100644
--- a/src/test/scala/leon/test/synthesis/AlgebraSuite.scala
+++ b/src/test/scala/leon/unit/synthesis/AlgebraSuite.scala
@@ -1,6 +1,6 @@
 /* Copyright 2009-2015 EPFL, Lausanne */
 
-package leon.test.synthesis
+package leon.unit.synthesis
 import leon.test._
 
 import leon.synthesis.Algebra._
diff --git a/src/test/scala/leon/test/synthesis/LinearEquationsSuite.scala b/src/test/scala/leon/unit/synthesis/LinearEquationsSuite.scala
similarity index 99%
rename from src/test/scala/leon/test/synthesis/LinearEquationsSuite.scala
rename to src/test/scala/leon/unit/synthesis/LinearEquationsSuite.scala
index 62c2ac92309ef75b75af9bfa2ba19fea914002b1..a754d837bc2aa6ee428a2a366a9018face5f4040 100644
--- a/src/test/scala/leon/test/synthesis/LinearEquationsSuite.scala
+++ b/src/test/scala/leon/unit/synthesis/LinearEquationsSuite.scala
@@ -1,6 +1,6 @@
 /* Copyright 2009-2015 EPFL, Lausanne */
 
-package leon.test.synthesis
+package leon.unit.synthesis
 import leon.test._
 
 import leon.LeonContext
diff --git a/src/test/scala/leon/test/utils/StreamsSuite.scala b/src/test/scala/leon/unit/utils/StreamsSuite.scala
similarity index 98%
rename from src/test/scala/leon/test/utils/StreamsSuite.scala
rename to src/test/scala/leon/unit/utils/StreamsSuite.scala
index 9d3b069bd07eac8374afc133d6dcd362e8b773b7..0dd732adac01c1d018677bd96f6a85b229ff55f8 100644
--- a/src/test/scala/leon/test/utils/StreamsSuite.scala
+++ b/src/test/scala/leon/unit/utils/StreamsSuite.scala
@@ -1,6 +1,6 @@
 /* Copyright 2009-2015 EPFL, Lausanne */
 
-package leon.test.utils
+package leon.unit.utils
 
 import leon.test._
 import leon.purescala.Common._
diff --git a/src/test/scala/leon/test/utils/UtilsSuite.scala b/src/test/scala/leon/unit/utils/UtilsSuite.scala
similarity index 95%
rename from src/test/scala/leon/test/utils/UtilsSuite.scala
rename to src/test/scala/leon/unit/utils/UtilsSuite.scala
index 55f798ec8b76c355395632747a9a0c26b07fba71..fe0286a9747a58aa56d9d3334f92121f444390a5 100644
--- a/src/test/scala/leon/test/utils/UtilsSuite.scala
+++ b/src/test/scala/leon/unit/utils/UtilsSuite.scala
@@ -1,6 +1,8 @@
 /* Copyright 2009-2015 EPFL, Lausanne */
 
-package leon.test
+package leon.unit.utils
+
+import leon.test._
 
 import leon.utils._