Fix failing tests

Some tests were failing because of the whitespace cleanup and
newline normalization.

Change-Id: I14fddf27cb81b56835fffedd80cf6a8727f04240
Fix failing test (line ends) for Windows