Finish implementation of remove()
Rename
Add test for remove()