Added template tags
Added tests for template tags