Merge "HealthCheckController/test refactor"