ClientHelper/ClientHelper tests update.