Added some more tests for new metrics code