Updated user_friendship relationship and modified friend integration test