Merge branch 'jk/http-test-fixes'