Fixed a few whitespace difference between templates and test expected results