Test fixes for solr changes