diff --git a/testcases/regression/Assign1.scala b/testcases/regression/Assign1.scala
deleted file mode 100644
index ef346a02c6f51f7a1fad605ef4a42cd11fe889a3..0000000000000000000000000000000000000000
--- a/testcases/regression/Assign1.scala
+++ /dev/null
@@ -1,18 +0,0 @@
-object Assign1 {
-
-  def foo(): Int = {
-    var a = 0
-    val tmp = a + 1
-    a = a + 2
-    a = a + 3
-    a = a + 4
-    //var j = 0
-    //var sortedArray = Map.empty[Int, Int]
-    //val tmp = sortedArray(j)
-    //sortedArray = sortedArray.updated(j, sortedArray(j+1))
-    //sortedArray = sortedArray.updated(j+1, tmp)
-    //sortedArray(j)
-    a
-  }
-
-}
diff --git a/testcases/regression/valid/Assign1.scala b/testcases/regression/valid/Assign1.scala
new file mode 100644
index 0000000000000000000000000000000000000000..0506c6afb39b49ac5a15c77dc10ab60f54de9ee6
--- /dev/null
+++ b/testcases/regression/valid/Assign1.scala
@@ -0,0 +1,12 @@
+object Assign1 {
+
+  def foo(): Int = {
+    var a = 0
+    val tmp = a + 1
+    a = a + 2
+    a = a + tmp
+    a = a + 4
+    a
+  } ensuring(_ == 7)
+
+}
diff --git a/testcases/regression/IfExpr1.scala b/testcases/regression/valid/IfExpr1.scala
similarity index 100%
rename from testcases/regression/IfExpr1.scala
rename to testcases/regression/valid/IfExpr1.scala
diff --git a/testcases/regression/MyTuple5.scala b/testcases/regression/valid/MyTuple3.scala
similarity index 65%
rename from testcases/regression/MyTuple5.scala
rename to testcases/regression/valid/MyTuple3.scala
index a36f3c73b7893563371bbb15302a5923bc85b3e9..2e14c067b78d86d4d915eb72178169d641e9755a 100644
--- a/testcases/regression/MyTuple5.scala
+++ b/testcases/regression/valid/MyTuple3.scala
@@ -1,4 +1,4 @@
-object MyTuple4 {
+object MyTuple3 {
 
   def foo(): Int = {
     val t = ((2, 3), true)
@@ -6,5 +6,3 @@ object MyTuple4 {
   } ensuring( _ == 3)
 
 }
-
-// vim: set ts=4 sw=4 et:
diff --git a/testcases/regression/MyTuple6.scala b/testcases/regression/valid/MyTuple4.scala
similarity index 100%
rename from testcases/regression/MyTuple6.scala
rename to testcases/regression/valid/MyTuple4.scala
diff --git a/testcases/regression/MyTuple7.scala b/testcases/regression/valid/MyTuple5.scala
similarity index 100%
rename from testcases/regression/MyTuple7.scala
rename to testcases/regression/valid/MyTuple5.scala
diff --git a/testcases/regression/Nested2.scala b/testcases/regression/valid/Nested1.scala
similarity index 92%
rename from testcases/regression/Nested2.scala
rename to testcases/regression/valid/Nested1.scala
index 30830df0b22bd2d51892e8e4103c71003844ad63..7745f794f369cf59b529133fa6c73383466acec8 100644
--- a/testcases/regression/Nested2.scala
+++ b/testcases/regression/valid/Nested1.scala
@@ -1,4 +1,4 @@
-object Nested2 {
+object Nested1 {
 
   def foo(i: Int): Int = {
     val n = 2
diff --git a/testcases/regression/While1.scala b/testcases/regression/valid/While1.scala
similarity index 75%
rename from testcases/regression/While1.scala
rename to testcases/regression/valid/While1.scala
index d7ab085dec990927da0afc226a4417d682b62868..0d868b399330c91342bd4ed26f7166f6b40dae5f 100644
--- a/testcases/regression/While1.scala
+++ b/testcases/regression/valid/While1.scala
@@ -4,10 +4,10 @@ object While1 {
     var a = 0
     var i = 0
     while(i < 10) {
-      a = a + i
+      a = a + 1
       i = i + 1
     }
     a
-  }
+  } ensuring(_ == 10)
 
 }
diff --git a/testcases/regression/valid/While2.scala b/testcases/regression/valid/While2.scala
new file mode 100644
index 0000000000000000000000000000000000000000..e841ed40ebf045e5545b584b5c16e80bfc11396a
--- /dev/null
+++ b/testcases/regression/valid/While2.scala
@@ -0,0 +1,13 @@
+object While1 {
+
+  def foo(): Int = {
+    var a = 0
+    var i = 0
+    while(i < 10) {
+      a = a + i
+      i = i + 1
+    }
+    a
+  } ensuring(_ == 45)
+
+}
diff --git a/testcases/regression/While2.scala b/testcases/regression/valid/While3.scala
similarity index 77%
rename from testcases/regression/While2.scala
rename to testcases/regression/valid/While3.scala
index de724d9baf6885b51b3801dcd6fb0c5826acaa81..da85d5dfab90410eb4d2ee23cea90627d1d40c93 100644
--- a/testcases/regression/While2.scala
+++ b/testcases/regression/valid/While3.scala
@@ -1,4 +1,4 @@
-object While1 {
+object While3 {
 
   def foo(): Int = {
     var a = 0
@@ -11,5 +11,3 @@ object While1 {
   } ensuring(_ == 54)
 
 }
-
-// vim: set ts=4 sw=4 et: