added more SolrQueryTests and preparing for Query switch over