IMprove doc and unittest.