client: improve test resiliency