CPK Refactoring, started tests in cpf-pentaho