Better doc and test.