CFY-647 fixed unit test