Merge "Remove an obsolete verification from test." into udc-dev