fixed comments and unit test