refactor Add even more template tests