Tests for UserResource
Testing
Merge remote-tracking branch 'origin/database_branch' into database_branch