Clean up integration-cli tests Upstream-commit: 240f3e14c78f34102672b121a43b612989856d0d Component: engine