sg=Added to tests, attempted to fix directory listings. Currently 2 tests fail for file within directory