Change config to resolve 404 tests
Resolve smoketest 404s by updating mappings
Remove or fix invalid tests - 404s should be served for these urls
Revert "Change config to resolve 404 tests"

This reverts commit 5cc661813dad110d146fd683b958c79d2f82273d.
Merge pull request #248 from rjc123/master

Change config to resolve 404 tests