Organize user model
Format tests