Added new CC tests, adjusted fields