Review doc and test
Review doc and test