Making directory navigation work and changing tests