Upgraded ScalaTest to 2.0 #26