Update for scala 2.11.1 and ScalaTest 2.2.0