Review doc and test