CFY-1671 fixed unit test