Add notFound test spec, and some cleanup.