Fix tests to include upstream metrics