CPK Refactoring - updated one test