Added ability to specify test folders, added some new metrics, implemented big switch statement for proper metric counting.