CFY-1311 fixed unit test