now all paths should be expanded
refactor path check and expansion
make features pass