Whitespace fixes, additional test.