Removing CP/CNP reference and fixing unit tests