Patch ensure_* tests