more descriptive test failure messages
(cherry picked from commit 173fb8d)