Merge "ultrahdr: Updates to unit tests" into main