Update doc and minor changes to tests