Switched to scala 2.11.0 and scalatest 2.1.4