Updates to docs and tests