fix failing client tests