Fixed facet test, also tweaked suggestions for solr