Cleanup test code
Cutting dependency between database and user service
Explicit handling of OAuth accounts