Refactor specs and add additional user model specs