Textual change and test update
Merge pull request #1401 from scottsds/issue_1652

Textual change and test update