This and the following commits will be messy due to the sprawling nature of bootstrapped test users.

(In progress)