Add uptime to the status endpoint.
Add uptime to tests, and generally re-org the tests a bit.