Update test suite to run under Solr4
Merge pull request #1 from marktriggs/extra_columns

Update tests to run under Sol4