[MRG] Minor improvements to test_metrics