Added additional indexes to be used when setting up new collections criteria
More tests