SCALATEST: Upgrade to 2.2.1 to fix allow running in eclipse with spark projects