remove handle
update tests