Fixed a bug with testing all directories
Fixed another bug with sorting groups ...