Worked on the DirectoryNamers
Fixed tests for new DirectoryNamer implementation
Removed unused var in FileSystemStorage test