Added more tests for user templates