Fix race with HTTP client in tests. (@Hodgestar)
Fix race with HTTP client in tests. (@Hodgestar)

TouK/vumi,harrissoerja/vumi,vishwaprakashmishra/xmatrix,TouK/vumi,harrissoerja/vumi,vishwaprakashmishra/xmatrix,harrissoerja/vumi,TouK/vumi,vishwaprakashmishra/xmatrix