Fix clobber tests