Remove Unnecessary EOL whitespace

Removing whitespace and fix tests in an attempt to alleviate the pain of migrating from a large JSON template wanting to compare changes with diff tools/SCM.