I'm going to work on merging the test refactor and confirming #1002.
#992 is a motivation for this - we've had support for modern Solr since Sep 21, 2013 but haven't shipped it yet and Honza's work on the test refactor should make both future releases and new contributions a lot easier.