More SOLR work - almost got integration test going