Putting integration tests together and sorting SOLR config out