Add factory_girl gems.
Improve solr fq based on Solrizer.solr_name as demoed by @cam156