Solr tests all but passing under Py3.
Final core changes.