Finish basic user actions and add tests
Merge branch 'updating-users' into develop