Improve metrics test suite.