Update User tests, use more shoulda