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

Ripped out bootstrap and fixed the tests of the directly affected DAOs.  Beginning work on the other affected classes