Merge "tests: Add test coverage for DirUtil."