Fix UptimeSupport and add tests