Update scalatest to 2.10.  fix tests