Add tests and manage 404s