Update docs and tests