Remove ScalaTest 2.0 deprecations