Removed trailing whitespace
Fixed tests that failed because of whitespace normalization