Add .kill, update tests