More test fixes
Merge pull request #1586 from LorenzoBoccaccia/httpclient-lifecycle

More test fixes