Make our StubHTTP implementation a little more robust against small changes