Merge "Remove obsolete test" into udc-dev