zcluster: use Script facilities, and better testing