Changes for UserEnt test