Updated to latest scalatest