Revert "TSTFIX use name, not metric, in test_metrics error messages"

This reverts commit 4b5ae7182427ef76ec1b48271c3c612019aee3fa.