Minor changes
Major updates to all the metric calculators
For all the packagemetrics, tests have been implemented.