Fixes to docs and tests