Fix client tests