You may get some merge conflicts here since there was a previous PR that went in but we basically did the same thing.

FYI -- We have some mocks that have "You", so user.getName() may not always be the case.