added tests
CCPF
merge