Fixed Path tests after refactor