Quick fix for udc tests