diff --git a/src/test/scala/coverage/All.scala b/src/test/scala/coverage/All.scala
deleted file mode 100644
index 7a36159..0000000
--- a/src/test/scala/coverage/All.scala
+++ /dev/null
@@ -1,14 +0,0 @@
-package coverage
-
-import com.fortysevendeg.lambdatest._
-
-// format: OFF
-
-object All {
-  def main(args: Array[String]): Unit = {
-    println("***** running off")
-    Off.main(args)
-    run("failonly", new FailOnly)
-    run("failure", new Failure)
-  }
-}
diff --git a/src/test/scala/coverage/FailOnly.scala b/src/test/scala/coverage/FailOnly.scala
deleted file mode 100644
index f903205..0000000
--- a/src/test/scala/coverage/FailOnly.scala
+++ /dev/null
@@ -1,19 +0,0 @@
-package coverage
-
-import com.fortysevendeg.lambdatest._
-import demo.Example
-
-// format: OFF
-
-class FailOnly extends LambdaTestRun {
-  val act =
-    changeOptions(_.copy(indent = 5, onlyIfFail = true)) {
-      new Example().act
-    }
-}
-
-object FailOnly {
-  def main(args: Array[String]): Unit = {
-    run("failOnly", new FailOnly)
-  }
-}
\ No newline at end of file
diff --git a/src/test/scala/coverage/Failure.scala b/src/test/scala/coverage/Failure.scala
deleted file mode 100644
index f8a56e7..0000000
--- a/src/test/scala/coverage/Failure.scala
+++ /dev/null
@@ -1,47 +0,0 @@
-package coverage
-
-import com.fortysevendeg.lambdatest._
-import demo.Example
-
-// format: OFF
-
-class Failure extends LambdaTestRun {
-
-  def fail(name: String) = {
-    throw new Exception(name)
-  }
-
-  def act = {
-    label("a") {
-      fail("a")
-      test("b") {
-        assert(true)
-      }
-    } +
-    label("a1") {
-      test("b1") {
-        fail("b1")
-        assert(true)
-      }
-    } +
-    label("a2") {
-      test("b2") {
-        assert(fail("c2"), "test exceptions")
-      }
-    } +
-    label("a3") {
-      test("b3") {
-        exec {
-          fail("c3")
-        } +
-        assert(true)
-      }
-    }
-  }
-}
-
-object Failure {
-  def main(args: Array[String]): Unit = {
-    run("exceptions", new Failure)
-  }
-}
diff --git a/src/test/scala/coverage/Off.scala b/src/test/scala/coverage/Off.scala
deleted file mode 100644
index aa5af88..0000000
--- a/src/test/scala/coverage/Off.scala
+++ /dev/null
@@ -1,12 +0,0 @@
-package coverage
-
-import demo.Example
-import com.fortysevendeg.lambdatest._
-
-// format: OFF
-
-object Off {
-  def main(args: Array[String]): Unit = {
-    run("off", new Example, change = _.copy(useColor = false, outHeader = false, outSummary = false))
-  }
-}
diff --git a/src/test/scala/demo/All.scala b/src/test/scala/demo/All.scala
deleted file mode 100644
index 1b84003..0000000
--- a/src/test/scala/demo/All.scala
+++ /dev/null
@@ -1,28 +0,0 @@
-package demo
-
-import com.fortysevendeg.lambdatest._
-
-// format: OFF
-
-class All extends LambdaTestRun {
-  val act = {
-    label("example")(new Example().act) +
-    label("except")(new Except().act) +
-    label("mutable")(new Mutable().act) +
-    label("immutable")(new Immutable().act) +
-    label("generate")(new Generate().act) +
-    label("wrap")(new Wrap().act) +
-    label("scalaCheck")(new ScalaCheck().act) +
-    label("parallel")(new Parallel().act) +
-    label("tags")(new Tag().act) +
-    label("bad")(new Bad().act)
-  }
-}
-
-object All {
-
-  def main(args: Array[String]): Unit = {
-    run("all", new All)
-  }
-
-}
diff --git a/src/test/scala/demo/Bad.scala b/src/test/scala/demo/Bad.scala
deleted file mode 100644
index bea3ae4..0000000
--- a/src/test/scala/demo/Bad.scala
+++ /dev/null
@@ -1,26 +0,0 @@
-package demo
-
-import com.fortysevendeg.lambdatest._
-
-import com.fortysevendeg.lambdatest.LambdaTest
-
-class Bad extends LambdaTest {
-
-  def fail(): Boolean = {
-    throw new Exception("bad")
-  }
-
-  def act = {
-    assert(false, "should have been in test") +
-      assert(true, "should also have been in a test")
-  } +
-    test("throws") {
-      assert(fail, "unexpected exception")
-    }
-}
-
-object Bad {
-  def main(args: Array[String]): Unit = {
-    run("bad", new Bad)
-  }
-}
diff --git a/src/test/scala/demo/Except.scala b/src/test/scala/demo/Except.scala
deleted file mode 100644
index b1093bd..0000000
--- a/src/test/scala/demo/Except.scala
+++ /dev/null
@@ -1,32 +0,0 @@
-package demo
-
-import com.fortysevendeg.lambdatest._
-
-// format: OFF
-
-class Except extends LambdaTest {
-
-  def doFoo = throw new Exception("foo")
-
-  def contains(expect: String)(ex: Throwable): Option[String] = {
-    val msg = ex.getMessage
-    val q = "\""
-    if (msg.contains(expect)) None else Some(s"$q$msg$q does not contain $q$expect$q")
-  }
-
-  val act =
-    label("Exception Tests") {
-      test("Throws Exception") {
-        assert(doFoo, "throw foo")
-      } +
-      test("Expect Exception") {
-        assertEx(doFoo, check = contains("bar"))
-      }
-    }
-}
-
-object Except {
-  def main(args: Array[String]): Unit = {
-    run("exceptions", new Example)
-  }
-}
\ No newline at end of file
diff --git a/src/test/scala/demo/Generate.scala b/src/test/scala/demo/Generate.scala
deleted file mode 100644
index cbbd07d..0000000
--- a/src/test/scala/demo/Generate.scala
+++ /dev/null
@@ -1,34 +0,0 @@
-package demo
-
-import com.fortysevendeg.lambdatest._
-import scala.util.Random
-
-// format: OFF
-
-class Generate extends LambdaTest {
-  val s = List(0, 5, 6, 3)
-
-  val act = {
-    label("List Tests") {
-      s.zipWithIndex.map {
-        case (i, j) => {
-          test(s"Elem test $j")(
-            assertEq(j, i)
-          )
-        }
-      }
-    } +
-    test("Gen") {
-      for (j <- 1 to 10) yield {
-        val i = Math.abs(Random.nextInt()) % 10
-        assert(i % 2 == 0, s"$i is even", showOk = false)
-      }
-    }
-  }
-}
-
-object Generate {
-  def main(args: Array[String]) = {
-    run("generate", new Generate)
-  }
-}
diff --git a/src/test/scala/demo/Immutable.scala b/src/test/scala/demo/Immutable.scala
deleted file mode 100644
index 037a4a6..0000000
--- a/src/test/scala/demo/Immutable.scala
+++ /dev/null
@@ -1,27 +0,0 @@
-package demo
-
-import com.fortysevendeg.lambdatest._
-
-// format: OFF
-
-class Immutable extends LambdaTest {
-
-  val act = test("empty") {
-    val s = Set.empty[Int]
-    assertEq(s.size, 0, "empty") +
-    nest {
-      val s1 = s + 3
-      assertEq(s1.size, 1, "insert") +
-      nest {
-        val s2 = s1 - 3
-        assertEq(s2.size, 0, "delete")
-      }
-    }
-  }
-}
-
-object Immutable {
-  def main(args: Array[String]): Unit = {
-    run("immutable", new Immutable)
-  }
-}
diff --git a/src/test/scala/demo/Mutable.scala b/src/test/scala/demo/Mutable.scala
deleted file mode 100644
index 20e242a..0000000
--- a/src/test/scala/demo/Mutable.scala
+++ /dev/null
@@ -1,27 +0,0 @@
-package demo
-
-import com.fortysevendeg.lambdatest._
-
-// format: OFF
-
-class Mutable extends LambdaTest {
-
-  val act = test("Mutable") {
-    var s = scala.collection.mutable.Set.empty[Int]
-    assertEq(s.size, 0, "empty") +
-    exec {
-      s add 3
-    } +
-    assertEq(s.size, 1, "insert") +
-    exec {
-      s remove 3
-    } +
-    assertEq(s.size, 0, "remove")
-  }
-}
-
-object Mutable {
-  def main(args: Array[String]): Unit = {
-    run("mutable", new Mutable)
-  }
-}
diff --git a/src/test/scala/demo/Parallel.scala b/src/test/scala/demo/Parallel.scala
deleted file mode 100644
index ceada82..0000000
--- a/src/test/scala/demo/Parallel.scala
+++ /dev/null
@@ -1,24 +0,0 @@
-package demo
-
-import com.fortysevendeg.lambdatest._
-
-// format: OFF
-
-class Parallel extends LambdaTest {
-
-  val act = label("Parallel Tests", parallel = true) {
-    test("Test1") {
-      assertEq(1, 2, "Int eq test")
-    } +
-    test("Test2") {
-      assertEq(2, 3, "Int eq test") +
-      assert(3 == 5 - 2, "should work")
-    }
-  }
-}
-
-object Parallel {
-  def main(args: Array[String]): Unit = {
-    run("parallel", new Parallel)
-  }
-}
diff --git a/src/test/scala/demo/ScalaCheck.scala b/src/test/scala/demo/ScalaCheck.scala
deleted file mode 100644
index c4c58b8..0000000
--- a/src/test/scala/demo/ScalaCheck.scala
+++ /dev/null
@@ -1,43 +0,0 @@
-package demo
-
-import com.fortysevendeg.lambdatest._
-import org.scalacheck.Prop._
-import org.scalacheck.Gen._
-import org.scalacheck.Test
-
-// format: OFF
-
-class ScalaCheck extends LambdaTest {
-  val act = {
-    label("ScalaCheck Tests") {
-      test("starts with")(assertSC() {
-        forAll { (a: String, b: String) =>
-          (a + b).startsWith(a)
-        }
-      }) +
-      test("concatenate")(assertSC() {
-        forAll { (a: String, b: String) =>
-          (a + b).length > a.length && (a + b).length > b.length
-        }
-      }) +
-      test("gen")(assertSC(params = Test.Parameters.default.withMinSuccessfulTests(200)) {
-        forAll(choose(1, 1000)) { n =>
-          n > 0 && n <= 1000
-        }
-      }) +
-      test("exists")(assertSC() {
-        exists(choose(0, 10)) {
-          _ == 3
-        }
-      })
-    }
-  }
-}
-
-object ScalaCheck {
-
-  def main(args: Array[String]): Unit = {
-    run("CB", new ScalaCheck)
-  }
-
-}
diff --git a/src/test/scala/demo/Tag.scala b/src/test/scala/demo/Tag.scala
deleted file mode 100644
index d766241..0000000
--- a/src/test/scala/demo/Tag.scala
+++ /dev/null
@@ -1,41 +0,0 @@
-package demo
-
-import com.fortysevendeg.lambdatest._
-
-// format: OFF
-
-class Tag extends LambdaTest {
-  def act =
-    test("test1", tags = Set("A")) {
-      assert(true)
-    } +
-    test("test2", tags = Set("B")) {
-      assert(true)
-    } +
-    test("test3", tags = Set("A", "ignore")) {
-      assert(true)
-    } +
-    test("test4", tags = Set("A", "B")) {
-      assert(true)
-    }
-}
-
-class AB(t: LambdaTest) extends LambdaTestRun {
-  def act = label("Run A Tests") {
-    changeOptions(_.copy(includeTags = Set("A"))) {
-      t.act
-    }
-  } + label("Run B Tests") {
-    changeOptions(_.copy(includeTags = Set("B"))) {
-      t.act
-    }
-  } + label("Run All Tests ") {
-    t.act
-  }
-}
-
-object Tag {
-  def main(args: Array[String]) = {
-    run("tags", new AB(new Tag))
-  }
-}
diff --git a/src/test/scala/demo/Wrap.scala b/src/test/scala/demo/Wrap.scala
deleted file mode 100644
index 0b32a14..0000000
--- a/src/test/scala/demo/Wrap.scala
+++ /dev/null
@@ -1,76 +0,0 @@
-package demo
-
-//import java.net.InetAddress
-
-//import akka.actor.ActorSystem
-import com.fortysevendeg.lambdatest._
-//import com.persist.logging._
-//import scala.concurrent.duration._
-//import scala.concurrent.Await
-//import scala.language.postfixOps
-
-class Wrap extends LambdaTest {
-
-  import java.io.{ BufferedReader, FileReader }
-
-  def fileWrap(fileName: String)(body: BufferedReader ⇒ LambdaAct): LambdaAct = {
-    SingleLambdaAct(t ⇒ {
-      val br = new BufferedReader(new FileReader(fileName))
-      try {
-        body(br).eval(t)
-      } finally {
-        br.close()
-      }
-    })
-  }
-
-  /*
-  def logWrap(body: LambdaAct): LambdaAct = {
-    SingleLambdaAct(t ⇒ {
-      val system = ActorSystem("test")
-      val host = InetAddress.getLocalHost.getHostName
-      val loggingSystem = LoggingSystem(system, "test", "1.0.0", "localhost", appenderBuilders = List(FileAppender))
-      try {
-        body.eval(t)
-      } finally {
-        Await.result(loggingSystem.stop, 30 seconds)
-        Await.result(system.terminate(), 20 seconds)
-      }
-    })
-  }
-
-  case class LogTest() extends ClassLogging {
-    def test = log.info("Log test")
-  }
-  */
-
-  // format: OFF
-
-  def act = {
-    fileWrap("foobar.txt") { f =>
-      test("test1") {
-        assertEq(f.readLine(), "foo", "line1") +
-        assertEq(f.readLine(), "bar", "line2")
-      }
-    } +
-    test("test2") {
-      fileWrap("foobar.txt") { f =>
-        assertEq(f.readLine, "zap", "line3")
-      }
-    }
-    /* +
-    logWrap {
-      test("LogTest") {
-        LogTest().test
-        assert(2 == 1 + 1, "log test")
-      }
-    }
-    */
-  }
-}
-
-object Wrap {
-  def main(args: Array[String]): Unit = {
-    run("wrap", new Wrap)
-  }
-}