Improve whitespace parsing in text blocks
Update template test result