CPK Refactoring- tests in cpf-core passing, cleaned up some files, updated pom with test specific runtime dependencies