update comments and Unit Test

update comments and Unit Test