Merge "fix fatal error in HttpTest"