Merge "CTS: Rename Compilation test classes"