Untested pass at adding all users
Add all users and related tests