fix problems with CollectionPatheMatcher when there are subdirs;
fix unit tests
fix problems with CollectionPatheMatcher when there are subdirs;
fix unit tests