CFY-1473 added tests