small changes to templates and tests based on code review