Fix some templatetag tests
Update part 9