PRD-5148 - Update test code to produce clearer messages