Remove new path naming, tests pass now :)