Fixes broken tests in UserManagerTest.java

Brian Gaffey
Merge remote-tracking branch 'origin/master'