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