Fix client tests (partially)