increase robustness of clienttest