Updating for new versions of Scala and ScalaTest