Add tests for add, remove