use client_id instead of xpl_source
continue tests