Path completion - wip
Path completion - wip
Refactor tests
Resolve tests