Added CC support with tests