fill basic column
update test
add test
remove unused
update find-entering-var
update tests