Switched to scala 2.11.1 and scalatest 2.2.0