More test coverage on cleanup of directories