ENH: Improved testing of the metrics