Upgraded to use ScalaTest 2.0.