Add final templates for specs to pass