Fixed client tests