Prepare for healthcheck test
Merge pull request #3113 from guardian/kc-healthcheck-test

Fix commercial healthcheck test