Whitespace change and test case improvement.