Updated XML for CCTS test file and minorr edits