Fixed criteria construction

Solr tests are not skipped any more, but run correctly.