Add regression test && template parsing fix

See #2228
2 files changed