Improve coverage for Directory tests