fixed typo
removed unused util/text
fixed template tests