Work on refactoring test user helper

Greatly simplifies the helper for creating users during tests, makes it less ambiguous, takes out all the now-useless admin support, etc. All tests refactored that use it.