Fix some tests
Move more logic out of user model into concerns