Updating docs and tests