safer tests + redeploy with property -Dcargo