Refactor walkFile and UnskipVisitAction and add tests