Refactoring of tests
Fix http response being disposed too soon
Merge pull request #485 from ovatsus/master

Refactoring of tests