added some unit test, update wording