Merge dirEntries unittests and modify to run within the same testdir.
Merge pull request #1657 from Safety0ff/filetesttrans

Merge dirEntries unittests and modify to run within the same testdir.