Add tests and implementations for 'remove()' methods