health-check: Quality commit

Let's make health-check much more flake compliant