Eliminate Scala 10 errors.  Move ScalaTest code out of src folder.