Update Metric handling in Evaluation

Now that there are separate base classes for Unary and Binary metrics the checks performed when inserting a metric need to be changed as well as the calling of 'run'.