DOC: Modifications to documentation following PR 5369 review.
TST: Modifications to unit test following PR 5369 review.