Solr spec and some spec refactored