Added unit tests for add and remove