Added test to user_spec, fixed join method in user model