PR Fixup: template -> failure string
PR Fixup: Fix typo
PR Fixup: fix broken unit test