Cleanup
Add tests for remove()