More test fixes for http
Merge pull request #489 from ovatsus/master

More test fixes for http