New class for calculating NKP values (and quickly)
Fixed unit tests for work with new data model API