Clean up use of on-demand generation of test users.
Merge pull request #8 from timothygordon32/clean-up-test-user-generation

Clean up use of on-demand generation of test users.