Updated to scalatest 2.0-M6 with scala.concurrent.Future support