Upgrade to ScalaTest 2.1.7