CFY-1318 add tests