Adds filesys cleanup to unit tests
Better cleanup in unit tests