Converted to generate metrics files
updated unit tests to handle new output.