Changes in response to code review
Failing test for userinfo-ignorant equivalence
Passing test for userinfo-ignorant equivalence