UserService beautified. Minimal test changes
Merge commit 'a9f05f22dacb203580a6571d95aec9390bf1220c'