Adds tests for UserService
Merge commit 'dfa72a11c954cf6acc23ac4f3fa3825242ddbbb7'