Added new tests for metrics calculation