CFY-1324 add missing data for impl and add unit tests