created test for custom template tag
added functionality to pass the test
merge with t2-branch