Added scalatest 2.0 support