Testing for multiple directories

Some reformatting to make cases easier to read