ClientTest fix