Add TemplateNotFound and specs