Tilovell/cleanupcleanuptests

Iterating on Andrew's proposed test cleanup work which I want to pick up. My motivation for this: Fakes.User.User just looked wrong.