Blank test
Switched to user http clients for tests.
Merged Joe's commit.