Added more tests around folders