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

This should prevent transient failures such as: http://d.puremagic.com/test-results/pull.ghtml?projectid=1&runid=768194