Switched to the latest scalatest and mockito and dropped scalamock for now.