Adding metrics and reporter tests. 62% coverage...