Whitespace cleanup.
Fixed failing tests.