Upgrade to scalatest 2.1.4