integration-cli: Better test cleanup with defer Upstream-commit: b062ef05e59ecfc0c08dccdea3d81c024c491350 Component: engine