Fixed tests and factories broken by model updates