Update to scalatest 2.0.M5