Added two more healthcheck tests.
Merge origin/master