PRD-5148 - Update test code to produce clearer messages
Merge pull request #434 from tmorgner/PRD-5148

PRD-5148 - Update test code to produce clearer messages