Fix tests and make grab of solr index work.