Fixed broken tests caused by model validation