Fix failing unit test

Also add unit test for userinfo removal.

[#60313156]
Merge 60313156- to master

[#60313156]