Fixed cpedata tests
Updated models