Add unit tests for add/delete fields