Move to ScalaTest 2.0.M5b