Tons of small-time reference fixing.
Be more explicit about solr mocking. It’s all green now!