Adding directory setup code and removing test that I can't get to work