Add better health checks and tests