Tidy code to thin it.

Change-Id: I0b7c2a406ddaf5b5b300292ce5d3a7f504d0149f
Add recent user to test expectations.

The withdrawn user was added in 3f29bd02, but the tests were
overlooked at the time. Credit Krenair for spotting this.

Change-Id: I944e80023dad212857b30812ef31269c412fd82e