Additional metrics being tracked; EvidenceSource refactor test cases passing