Add more tests
Update doc