update find-leaving-var
update tests