Merge "Revert "Re-enabling a couple of tests"" into udc-dev