Updated template tags, tests to actually work