Modify tests to use the new UserFactory snazziness.