[#52403513] Updating metric data to be consistent with component data. Added unit test for Agent