Update doc, make test pass (finally)