Fix scalamock dependency + version updates.