Add notFound test spec, and some cleanup.
Merge pull request #19 from leftclickben/master

Add notFound test spec, and some cleanup.