Fix web client tests hanging