CPK Refactoring - testing