Update ScalaTest to 2.9.2 and resolve deprecations