push the temporary changes; trying to fix zdup test

most of them should from coolo, I guess :)