ScalaTest upgrade