Improve health check test coverage