CPK Refactoring - starting tests