Fix custom field validation tests