diff --git a/build.sbt b/build.sbt
index 14d73203e7920e3f21f24292a3bc076882a52b3d..d0470fa87ad3446a2e2a3ddf6b71855f1fae689c 100644
--- a/build.sbt
+++ b/build.sbt
@@ -39,7 +39,7 @@ javaOptions in Test ++= Seq("-Xss32M", "-Xmx4G", "-XX:MaxPermSize=128M")
 
 parallelExecution in Test := false
 
-testOptions in (Test, run) := Seq(Tests.Filter(s => s.endsWith("LeonAllTests")), Tests.Argument("-oDF"))
+testOptions in (Test, test) := Seq(Tests.Filter(s => s.endsWith("LeonAllTests")), Tests.Argument("-oDF"))
 testOptions in (Test, testOnly) := Seq(Tests.Argument("-oDF"))
 
 sourcesInBase in Compile := false
diff --git a/src/main/scala/leon/synthesis/rules/CEGISLike.scala b/src/main/scala/leon/synthesis/rules/CEGISLike.scala
index 96c28f23485eb3c68fb7ae7f53305e8d1350b57e..974509205c6de051dfe1aff53a142d70bd1c28e3 100644
--- a/src/main/scala/leon/synthesis/rules/CEGISLike.scala
+++ b/src/main/scala/leon/synthesis/rules/CEGISLike.scala
@@ -840,13 +840,11 @@ abstract class CEGISLike[T <% Typed](name: String) extends Rule(name) {
         val cachedInputIterator = new Iterator[Seq[Expr]] {
           def next() = {
             val i = inputIterator.next()
-            println("Found "+i)
             baseExampleInputs += i
             i
           }
 
           def hasNext = {
-            println("Has next? "+ inputIterator.hasNext)
             inputIterator.hasNext
           }
         }
diff --git a/src/test/scala/leon/test/evaluators/EvaluatorsTests.scala b/src/test/scala/leon/test/evaluators/EvaluatorsTests.scala
index 635e0c0428e49d76a2b1a934f43f2402f60761ec..f26e633eb28fd3d7f0e3b3a1333f7c53f067b0bf 100644
--- a/src/test/scala/leon/test/evaluators/EvaluatorsTests.scala
+++ b/src/test/scala/leon/test/evaluators/EvaluatorsTests.scala
@@ -460,7 +460,7 @@ class EvaluatorsTests extends leon.test.LeonTestSuite {
 
     implicit val prog = parseString(p)
 
-    val e = new CodeGenEvaluator(leonContext, prog, CodeGenParams(maxFunctionInvocations = 32))
+    val e = new CodeGenEvaluator(leonContext, prog, CodeGenParams.default.copy(maxFunctionInvocations = 32))
     checkEvaluatorError(e, mkCall("c", IL(42)))
   }
 
@@ -479,7 +479,7 @@ class EvaluatorsTests extends leon.test.LeonTestSuite {
 
     implicit val prog = parseString(p)
 
-    val e = new CodeGenEvaluator(leonContext, prog, CodeGenParams(checkContracts = true))
+    val e = new CodeGenEvaluator(leonContext, prog, CodeGenParams.default)
     checkError(e, mkCall("c", IL(-42)))
   }