upgrade to ScalaTest 2.0.M6

(sorry, I know I already just merged a commit that said it did this,
but I got confused about the version numbers)