Using np.unique now
Fix for metrics with multiple values
Fix for metrics with multiple values
Reorder methods
New and improved tests