CFY-1232 add tests