Fixed some CCS bugs
Merge branch 'UnitTesting' into CCS