update code comments and some test cases