Updated TouchCML test
Updated cml tests for recent changes