Test client: tweak