fix remove()
update tests