Added more template tests