updated to Scala 2.11.2, updated scalatest