Coverage for CPP as well