change model_id field type and tweak tests