add new template and test for comments