Handle more 404s with redirects not exceptions
Replace controller tests with integration tests