Fix deprication warnings from ScalaTest 2.0 upgrade