Updated to scala 2.10 and scalatest 2.0