Fixed paths so unit tests pass