Upgrading to ScalaTest 2.1.0