Removing CP/CNP refrences
Removing CP/CNP reference
Fixing unit tests
Merge pull request #32 from arktseytlin/master

Removing CP/CNP reference and fixing unit tests