CFY-1025 setup diamond test skeleton