Docs improvements.
Minor code cleanup on test utility.