Add tests for #remove