Merge "Remove legacy tests" into udc-dev