Added untag_metric/2 API call, updated unit tests accordingly, small improvements