Merge pull request #38 from collective/stable_solr_urls

Stable solr urls
Add readability

Just adding newlines to split up different stages
Just a small refactoring

that broke a lot of tests.
That turned out to be flawed because PTC tests aren't isolated.

After I converted the tests, I felt the need to pep8 the ... out of it.