CFY-1798 added test