Health Check tests and ui improvements