Moving tests around, upgrading to Scala 2.10.1