Refactor tests part3 - test template tags, add additional tests

I'll add a description tomorrow. :bear: