removed testNoIndexingWithMethodOverride as ATPortalTypeCriterion is now obsolete and there seems to be no other example of an object that does not want to be indexed
'Topic' is now 'Collection', round 2
removed testReindexSkipsNonReferencableItems, see a24b3b4ccef74e1e55811db517d8d277316badd7
CatalogTool.indexes is not patched any more, adapted test
'Topic' is now 'Collection', round 3
fixed setQuery for Collection test. Test still fails, but this now reveals an actual problem, as the error also happens on a real site with plone.app.collection and collective.solr installed