Implement item removal and add tests for update and removal