Fixing the tests to work with uid, nuid, duid