Directory is now fixed

As well as i passed more tests now