Update cpg to make the cpg tests more dependable.