Fixed for new CAP format
Added regression for new format for CAP