Modify MockUserService to use UserIdentifier

ACE-83