Update CPK
Fix spec failures related to new DN syntax