upgrade to scalatest 2.0.0M6
and some other clean up