templater fix; new tests