fixed tests and templatetag