Even more clean up
Add test for 404 page.