custom field fix tests WIP