Moved controller tests and added 404 scenarios.
Updated 404 message.
Merge pull request #49 from brendanfmartin/404scenarios

404scenarios