Merge "Add UT for HealthcheckHandler"