CFY-1304 fixed tests