Changes in comments and unit test.