Updated docs and tests