cpml testing changes