DGM-23 Fixed the tests, removed the complicated assisted injection. There is something weird with HttpHostConnectException not getting catched (at least on my OS X 10.8.2 system with Oracle JDK 1.7.0_11-b21).