Merge "Deduplicate test expectation data in a different way" into udc-dev