Removed unused method, updated search directory handling
Fixed naming of DirSetCollection method
Updated unit tests