Add test support for add/remove fields.