Fix the review comments with the unit tests
Update the doc