Fix common test usage, and merge in additional document changes.