Whitespace changes.
Add default value and tests.
Update tests, and remove skipped tests.