TSTFIX use name, not metric, in test_metrics error messages

Also, fix error messages without spaces