Started adding tests for user management
Merge branch 'master' into tests