Implemented remove method + tests