Merge "Starting Unit Tests for Metrics" into udc-dev