Fix message formatting errors uncovered by p_test_fail() refactoring.
5 files changed