Add even more template tests