Upgrade version of ScalaTest to 2.0 and ScalaMock to 3.1.RC1