Update tests to run under Sol4

Hi Tod,

Here's an update to try to get the tests running under Solr4.  I'll mail separately too :)