Move api_check and connection check to healthcheck category