Implemented the add()/remove() methods with tests