Updated a bunch of tests in User and Friendship