#867,897,855 Fixed unit tests after solr change