ScalaTest 2.0

Upgraded to use ScalaTest 2.0.