ScalaTest 2.0 M6 Support

Included adjustments to support upcoming ScalaTest 2.0.M6.