Fixed diff with metric, added tests for this case