upgrade to ScalaTest 2.1