CFY-1728 add unit test