Fixed tests for new DirectoryNamer implementation