Updated Scala version, added ScalaTest