Migration to ScalaTest 2.0