Fix failing Solr tests

#5455 
WIP