Some changes to comparative metrics and testing