Added templatetag and respective tests