gh-1746 Update docs as well; and fix tests in other places