More work on solr, particularly testability