CFY-1025 fix diamond test